Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions week10/ff-merge.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
๊ทธ๋ ‡๋‹ค๋ฉด `A` ๋ธŒ๋žœ์น˜๊ฐ€ `B` ๋ธŒ๋žœ์น˜์™€ ํ•ฉ์ณ์ง„๋‹ค๊ณ  ์ƒ๊ฐํ–ˆ์„ ๋•Œ ํ˜„์žฌ `A` ๋ธŒ๋žœ์น˜๊ฐ€ ๊ฐ€๋ฆฌํ‚ค๋Š” ์ปค๋ฐ‹์„ `B` ๋ธŒ๋žœ์น˜์—์„œ ๋‚ด์šฉ์ด ์ถ”๊ฐ€๋œ ์ปค๋ฐ‹์œผ๋กœ ์„ค์ •ํ•˜๋ฉด ๋˜๊ฒ ์ฃ ?
์ด๋ ‡๊ฒŒ ์ง„ํ–‰ํ•  ๊ฒฝ์šฐ A ๋ธŒ๋žœ์น˜์—์„œ ๋‚ด์šฉ ์ถ”๊ฐ€๋ผ๋Š” ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ์ƒˆ๋กœ ์ƒ์„ฑํ•˜์ง€ ์•Š๊ณ ๋„ ์ฐธ์กฐ ๊ฐ’์„ ๋ณ€๊ฒฝํ•ด ๋‘ ๋ธŒ๋žœ์น˜์˜ ๋ณ€๊ฒฝ ์‚ฌํ•ญ์„ ํ•˜๋‚˜๋กœ ํ•ฉ์น  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.
์œ„์™€ ๊ฐ™์ด ์‹ค์ œ ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ํ•ฉ์น˜๊ธฐ๋ณด๋‹ค๋Š” `HEAD`๋ฅผ ์˜ฎ๊ธฐ๋Š” ๋ฐฉ๋ฒ•์„ **fast-forward merge**๋ผ๊ณ  ํ•ฉ๋‹ˆ๋‹ค.

Git์—์„œ๋Š” ๊ธฐ์ค€์ด ๋˜๋Š” ๋ธŒ๋žœ์น˜์— ์‹ ๊ทœ ์ปค๋ฐ‹์ด ์กด์žฌํ•˜์ง€ ์•Š๊ณ  ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜์—๋งŒ ์ƒˆ๋กœ์šด ์ปค๋ฐ‹์ด ์กด์žฌํ•  ๋•Œ ์ž๋™์œผ๋กœ fast-forward merge๋ฅผ ์‹คํ–‰ํ•ฉ๋‹ˆ๋‹ค.
4 changes: 2 additions & 2 deletions week10/pull-practice.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
git pull์€ fetch์™€ merge๋ฅผ ๊ฒฐํ•ฉํ•œ ๋ช…๋ น์–ด์ž…๋‹ˆ๋‹ค.
๋ฌผ๋ก  fetch๋ฅผ ์ด์šฉํ•ด ์›๊ฒฉ ๋ ˆํฌ์ง€ํ† ๋ฆฌ์˜ ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ๊ฐ€์ ธ์˜ค๊ณ  mergeํ•˜๋Š” ๋ฐฉ์‹์€ ์•ˆ์ „ํ•˜๋‹ค๋Š” ์žฅ์ ์ด ์žˆ์ง€๋งŒ ์‚ฌ์‹ค ์ข€ ๊ท€์ฐฎ๋‹ค๋Š” ๋‹จ์ ์ด ์žˆ์Šต๋‹ˆ๋‹ค.
์›๊ฒฉ ๋ธŒ๋žœ์น˜์˜ ๋‚ด์šฉ์„ ๋ฐ›์•„์™€์„œ ์ž๋™์œผ๋กœ ํ˜„์žฌ ๋ธŒ๋žœ์น˜์— ๋ฐ˜์˜ํ•˜๊ณ ์ž ํ•  ๋•Œ ์œ„์™€ ๊ฐ™์ด `pull` ๋ช…๋ น์–ด๋ฅผ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
์ž‘์—…ํ•˜๊ณ  ์žˆ๋Š” ๋ธŒ๋žœ์น˜์— ์ตœ์‹  ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ๋ฐ˜์˜ํ•˜๊ณ ์ž ํ•  ๋•Œ ์œ ์šฉํ•˜๊ฒŒ ์“ฐ์ผ ์ˆ˜ ์žˆ์–ด์š”.
๋‹ค๋งŒ pull์˜ ๊ฒฝ์šฐ ์ž๋™์œผ๋กœ fetch์™€ merge ๋ฅผ ๋™์‹œ์— ์ˆ˜ํ–‰ํ•˜๊ธฐ ๋•Œ๋ฌธ์— ์ถฉ๋Œ์ด ๋ฐœ์ƒํ•  ์ˆ˜๋„ ์žˆ์Šต๋‹ˆ๋‹ค. ์ด ๊ฒฝ์šฐ ๋‹นํ™ฉํ•˜์ง€ ๋งˆ์‹œ๊ณ  ์œ„์—์„œ ๋ฐฐ์› ๋˜ ๊ฒƒ์ฒ˜๋Ÿผ ์นจ์ฐฉํ•˜๊ฒŒ ์ถฉ๋Œ์„ ํ•ด๊ฒฐํ•˜์‹  ํ›„ ์ปค๋ฐ‹ํ•˜์‹  ๋’ค ํ•œ๋ฒˆ ๋” pull ๋ช…๋ น์–ด๋ฅผ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”!
4 changes: 2 additions & 2 deletions week10/threeway-merge.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
3-way merge๋Š” ์„œ๋กœ ๋‹ค๋ฅธ ๋‘ ๋ธŒ๋žœ์น˜์—์„œ ๋‘ ๋ธŒ๋žœ์น˜ ๋ชจ๋‘ ๋‹ค๋ฅธ ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ์ƒ๊ธฐ๋Š” ๊ฒฝ์šฐ ์‚ฌ์šฉ๋˜๋Š” merge ๋ฐฉ์‹์ž…๋‹ˆ๋‹ค.
base๊ฐ€ ๋˜๋Š” ์ปค๋ฐ‹์„ ๊ธฐ์ค€์œผ๋กœ ๊ฐ ๋ธŒ๋žœ์น˜์˜ ๋ณ€๊ฒฝ ๋‚ด์šฉ์„ ๋น„๊ตํ•˜์—ฌ ๋ณ‘ํ•ฉํ•ฉ๋‹ˆ๋‹ค.
์„œ๋กœ ๋‹ค๋ฅธ ๋‘ ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ํ•ฉ์ณ์ง€๋Š” ๊ฒฝ์šฐ์—๋Š” ๋ฐ˜๋“œ์‹œ ๋‘ ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ๋ณ‘ํ•ฉํ•˜๋Š” ์ƒˆ๋กœ์šด ๋ณ€๊ฒฝ์ ์„ ์ƒ์„ฑํ•˜๊ฒŒ ๋ฉ๋‹ˆ๋‹ค.
์ด ๋ฐฉ์‹์€ ์ถฉ๋Œ์ด ๋ฐœ์ƒํ•  ๊ฐ€๋Šฅ์„ฑ์ด ์žˆ๊ณ  ์ถฉ๋Œ์ด ๋ฐœ์ƒํ•˜๋ฉด ์ˆ˜๋™์œผ๋กœ ํ•ด๊ฒฐํ•ด์•ผ ํ•ด์š”.

Git์˜ merge ์•Œ๊ณ ๋ฆฌ์ฆ˜์€ base ์ปค๋ฐ‹, HEAD, merge ํ•˜๋Š” ๋Œ€์ƒ ๋ธŒ๋žœ์น˜์˜ ๋ณ€๊ฒฝ ๋‚ด์šฉ์„ ๊ธฐ๋ฐ˜์œผ๋กœ ๋™์ž‘ํ•ฉ๋‹ˆ๋‹ค.
Git์˜ merge๋Š” base ์ปค๋ฐ‹, HEAD, merge ํ•˜๋Š” ๋Œ€์ƒ ๋ธŒ๋žœ์น˜์˜ ๋ณ€๊ฒฝ ๋‚ด์šฉ์„ ๊ธฐ๋ฐ˜์œผ๋กœ ๋™์ž‘ํ•ฉ๋‹ˆ๋‹ค.