๐Ÿ‘ PR ์˜ฌ๋ฆฌ๊ธฐ ์ „์—?

๐Ÿƒโ€โ™‚๏ธ ์ฝ”๋“œ ๋ฆฌ๋ทฐ๋Š” 24์‹œ๊ฐ„ ๋‚ด๋กœ

๐Ÿ”–ย PR ๋‚ด์šฉ์€?

๐Ÿ•๏ธ ๋จธ์ง€ ๋ฐฉ์‹

rebase and merge

git switch develop
# develop branch ์ตœ์‹ ํ™”
git pull origin develop
# ์ž‘์—… branch ์˜ˆ์‹œ : DK-104
git switch DK-104
# rebase
git rebase develop
# ๋งŒ์•ฝ conflict ๋ฐœ์ƒ ์‹œ ํ•ด๊ฒฐ ํ›„
git add .
git rebase --continue
# ์œ„ ๊ณผ์ • ๋ฐ˜๋ณต ๊ทธ๋ฆฌ๊ณ  rebase ์ข…๋ฃŒ ํ›„
git push origin DK-104 -f
# ๊ทธ๋ฆฌ๊ณ  github ๊ฐ€์„œ merge ๋ฒ„ํŠผ ํด๋ฆญ!

๐ŸŽฒ ์ž‘์—… ๋ธŒ๋žœ์น˜ ์ตœ์‹ ํ™” ๋ฐฉ๋ฒ•

# ์ž‘์—… ์ฝ”๋“œ๊ฐ€ ๋‚จ์•„์žˆ๋‹ค๋ฉด
git add .
git stash
# ์ดํ›„ ๋จธ์ง€ ์ฝ”๋“œ์™€ ๋™์ผ
git stash pop
# ๋งŒ์•ฝ conflict ๋ฐœ์ƒ ์‹œ ํ•ด๊ฒฐ ํ›„
git add .
# stash์— ๋‚จ์•„์žˆ๊ธฐ ๋•Œ๋ฌธ์—
git stash drop
# staged ์ƒํƒœ๋ฅผ ํ’€์–ด์ค€๋‹ค
git restore --staged .
# ๊ทธ๋ฆฌ๊ณ  ์ž‘์—…์„ ์ด์–ด๊ฐ€๋ฉด ๋œ๋‹ค!

๐ŸŒŸ ์œ ์šฉํ•œ ๊นƒ ๋ช…๋ น์–ด