• Feed
  • Explore
  • Ranking
/
๐ŸŒ Git
2
Git์„ ํ™œ์šฉํ•œ ๋ฒ„์ „ ๊ด€๋ฆฌ ๋ฐฉ๋ฒ•์„ ๋‹ค๋ฃน๋‹ˆ๋‹ค.
์ง€
์ง€์„ฑ
4 ํŒ”๋กœ์›Œ
ยท
0 ํŒ”๋กœ์ž‰
๊ณ ์–‘์ด ์•‰ํ˜€๋†“๊ณ  ์ฝ”๋”ฉ
ํƒœ๊ทธ
์ตœ๊ทผ ๋Œ“๊ธ€
[Git] Merge vs Rebase: ๋„๋Œ€์ฒด ๋ญ๊ฐ€ ์ข‹์ง€?๋ธŒ๋žœ์น˜๋ฅผ ๋ณ‘ํ•ฉํ•˜๋Š” ๋ฐฉ๋ฒ•์—๋Š” merge์™€ rebase ๋‘ ๊ฐ€์ง€์˜ ์ฃผ์š” ์ „๋žต์ด ์žˆ๋‹ค. ์ง€๊ธˆ๊นŒ์ง€๋Š” ๋‹น์—ฐํ•˜๊ฒŒ๋„ merge๋งŒ์„ ์‚ฌ์šฉํ•ด์™”๋‹ค. ๊ฐœ๋ฐœ์„ ์‹œ์ž‘ํ•œ ์ดํ›„๋กœ rebase๋ฅผ ํ™œ์šฉํ•˜๋Š” ๊ธฐ์—…์„ ๊ฒฝํ—˜ํ•ด๋ณธ ์ ๋„, ์ ๊ทน์ ์œผ๋กœ ์‚ฌ์šฉํ•˜๋Š” ๊ฐœ๋ฐœ์ž๋ฅผ ๋งŒ๋‚˜๋ณธ ์ ๋„ ์—†์—ˆ๋‹ค.์ตœ๊ทผ iOS ํ”„๋กœ์ ํŠธ๋ฅผ ์ง„ํ–‰ํ•˜๋ฉด์„œ rebase๋ฅผ ํ™œ์šฉํ•ด ๋ณ‘ํ•ฉ์„ ์ˆ˜ํ–‰ํ•˜๋Š” ๊ฐœ๋ฐœ์ž๋ฅผ ์ ‘ํ•˜๊ฒŒ ๋˜์–ด(์ด ๋ฐฉ์‹์˜ ์žฅ์ ์—
0
0
a year ago
7 min read
[Git] merge ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ์ž‘์„ฑ๋ฒ•์ด์ „์—๋Š” git merge์‹œ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ๊ธฐ๋ณธ์ ์œผ๋กœ ์ƒ์„ฑ๋œ ๋‚ด์šฉ์œผ๋กœ ์ž‘์„ฑํ–ˆ๋Š”๋ฐ, merge ๋ฉ”์‹œ์ง€๋„ ๋ณ„๋„์˜ ์Šคํƒ€์ผ ๊ฐ€์ด๋“œ๊ฐ€ ์žˆ์ง€ ์•Š์„๊นŒ? ํ•ด์„œ ์ฐพ์•„๋ณธ ๋‚ด์šฉ์„ ๊ณต์œ ํ•œ๋‹ค.Titlemerge ์ ‘๋‘์‚ฌ๋ฅผ ์‚ฌ์šฉํ•ด ๋ณ‘ํ•ฉ ์ปค๋ฐ‹์ž„์„ ๋ช…ํ™•ํžˆ ํ‘œ์‹œmerge: feature/authentication ์ถ”๊ฐ€ (from feature/auth)Body๋ณ‘ํ•ฉ๋œ ๋ธŒ๋žœ์น˜์˜ ์ž‘์—… ๋‚ด์šฉ ์š”
0
0
a year ago
1 min read
git
์•„์ง ๋Œ“๊ธ€์ด ์—†์–ด์š”