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

๋ชฉ๋กgit rebase main (1)

Unfazedโ—๏ธ๐ŸŽฏ

git rebase ๋™์ž‘ ๊ณผ์ •, ์ฃผ์˜์‚ฌํ•ญ, merge vs rebase

git rebase : ํ•œ ๋ธŒ๋žœ์น˜์˜ ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜ ์œ„๋กœ ์žฌ๋ฐฐ์น˜์‹œํ‚ค๋Š” ๋ช…๋ น์–ด Rebase์˜ ์žฅ์ ๋ณ‘ํ•ฉ ์ปค๋ฐ‹์ด ์—†์–ด ์ปค๋ฐ‹ ํžˆ์Šคํ† ๋ฆฌ๋ฅผ ๊น”๋”ํ•˜๊ฒŒ ์ •๋ฆฌ ๊ฐ€๋Šฅํ•˜๊ณ  ๊ฐ€๋…์„ฑ์ด ์ข‹์ŒํŠน์ • ๊ธฐ๋Šฅ์— ๋Œ€ํ•œ ์ปค๋ฐ‹๋“ค์„ ์—ฐ์†์ ์œผ๋กœ ๋ณผ ์ˆ˜ ์žˆ์–ด ์ฝ”๋“œ ๋ฆฌ๋ทฐ๊ฐ€ ์šฉ์ด Rebase ์‚ฌ์šฉ ์˜ˆ์œ„ ๊ทธ๋ฆผ๊ณผ ๊ฐ™์ด ๋‘ ๊ฐœ์˜ ๋ธŒ๋žœ์น˜๋กœ ๋‚˜๋ˆ„์–ด์ง„ ์ปค๋ฐ‹ ํžˆ์Šคํ† ๋ฆฌ๋ฅผ ํ•ฉ์น˜๊ณ  ์‹ถ์€ ์ƒํ™ฉ์—์„œ ์šฐ๋ฆฌ๋Š” merge ๋ช…๋ น์„ ์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ์„ ๊ฒƒ์ด๋‹ค.$ git chekcout mainSwitched to branch 'main'$ git merge experimentMerge made by the 'recursive' strategy.merge ๋ช…๋ น ์‹คํ–‰์‹œ ํ˜„์žฌ ๋ธŒ๋žœ์น˜(main)๊ฐ€๋ฆฌํ‚ค๋Š” ์ปค๋ฐ‹(c3)๊ฐ€ mergeํ•  ๋ธŒ๋žœ์น˜(experiment)์˜ ์กฐ์ƒ์ด ์•„๋‹ˆ๋ฏ€๋กœ 3-way..

Git, GitHub 2025. 1. 10. 16:24