๊ด€๋ฆฌ ๋ฉ”๋‰ด

๋ชฉ๋กMerge (2)

Unfazedโ—๏ธ๐ŸŽฏ

git merge, merge ์ข…๋ฅ˜(Fast-forward Merge, 3-way Merge), merge conflict ๋ฐœ์ƒ ์ด์œ  ๋ฐ ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•

git merge : ์„œ๋กœ ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜์˜ ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ํ•˜๋‚˜๋กœ ํ†ตํ•ฉํ•˜๋Š” ๋ช…๋ น์–ดmerge์— ๋Œ€ํ•œ ๋‘ ๊ฐ€์ง€ ์ค‘์š”ํ•œ ๊ฐœ๋…1. ํŠน์ • commit์ด ์•„๋‹Œ branch๋ฅผ ๋ณ‘ํ•ฉํ•˜๋Š” ๊ฒƒmerge ๋ช…๋ น์–ด๋Š” ์ „์ฒด branch์˜ ์ž‘์—… ๋‚ด์šฉ์„ ๋ณ‘ํ•ฉํ•˜๋Š” ๊ฒƒ์ด์ง€, ๊ฐœ๋ณ„ commit์„ ์„ ํƒํ•ด์„œ mergeํ•˜๋Š” ๊ฒƒ์ด ์•„๋‹ˆ๋‹ค.branch๋Š” ์ผ๋ จ์˜ commit๋“ค์˜ ํฌ์ธํ„ฐ์ด๋ฉฐ, ๊ทธ ๋ธŒ๋žœ์น˜์˜ ์ตœ์‹  ์ƒํƒœ(tip)๋ฅผ ๋Œ€ํ‘œํ•œ๋‹ค. 2. ํ•ญ์ƒ ํ˜„์žฌ HEAD ๋ธŒ๋žœ์น˜๋กœ ๋ณ‘ํ•ฉmerge ๋ช…๋ น์„ ์‹คํ–‰ํ•  ๋•Œ, ๋‹ค๋ฅธ branch์˜ ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ํ˜„์žฌ ์ฒดํฌ์•„์›ƒ(checkout)๋œ branch(HEAD๊ฐ€ ๊ฐ€๋ฆฌํ‚ค๋Š” branch)๋กœ ๋ณ‘ํ•ฉ๋œ๋‹ค.์ฆ‰, ํ•ญ์ƒ ํ˜„์žฌ branch ์ชฝ์œผ๋กœ ๋ณ‘ํ•ฉ ๋œ๋‹ค.ex) feature ๋ธŒ๋žœ์น˜๋ฅผ master์— ๋ณ‘ํ•ฉ(merge)ํ•˜๋ ค๋ฉด, ๋จผ์ € master ๋ธŒ..

Git, GitHub 2025. 1. 10. 14:31