git

git pull์„ ํ–ˆ๋Š”๋ฐ ๋ฐ˜์‘์ด ์—†๋Š” ๋ฌธ์ œ

MacBookPro:ํด๋”๋ช… ๋‚ด์ปดํ„ฐ$ git pull

There is no tracking information for the current branch.

Please specify which branch you want to merge with.

See git-pull(1) for details.



    git pull <remote> <branch>



If you wish to set tracking information for this branch you can do so with:



    git branch --set-upstream-to=origin/<branch> master

 

git pull์„ ํ–ˆ๋Š”๋ฐ ์ด๋Ÿฐ ๊ฒŒ ๋‚˜์˜ค๋ฉด์„œ... ๋™๊ธฐํ™”๋œ ํด๋”์—” ๋ฐ˜์‘์ด ์—†์—ˆ๋‹ค.

git pull <git์ฃผ์†Œ> ๋„ฃ์–ด๋„ ์•ˆ ๋์Œ.

 

๊ตฌ๊ธ€๋ง ํ•˜๋‹ค๊ฐ€ git stash ํ›„ git pull ์„ ํ•˜๋ฉด ํ•ด๊ฒฐ๋œ๋‹ค๋Š” ๊ธ€ ๋ฐœ๊ฒฌํ•จ.

stash ํ•˜๊ณ  pull ํ–ˆ๋Š”๋ฐ ์•ˆ ๋จ. ํ˜„์žฌ branch์—์„œ tracking ์ •๋ณด๊ฐ€ ์—†๋‹ค๊ณ  ํ•จ.

 

git stash ํ›„ git pull <git์ฃผ์†Œ> ๋„ฃ์œผ๋‹ˆ๊นŒ ๋จ. ํ•ด๊ฒฐ.

 

git stash๋Š” ํ•˜๋˜ ์ž‘์—…์„ ์ž„์‹œ๋กœ ์ €์žฅํ•ด ๋‘๋Š” ๊ฑด๋ฐ... ์–ด์ฐจํ”ผ pull ํ•  ๊ฑฐ๋ผ ํ•˜๋˜ ์ž‘์—… ํ•„์š”๋Š” ์—†์—ˆ์ง€๋งŒ.

git stash apply ๋ช…๋ น์–ด๋ฅผ ์‚ฌ์šฉํ•˜๋ฉด stashํ–ˆ๋˜ ํŒŒ์ผ๋“ค ๋‹ค์‹œ ๊ฐ€์ ธ์˜ฌ ์ˆ˜ ์žˆ๋‹ค.

git stash apply // ๊ฐ€์žฅ ์ตœ๊ทผ์— stashํ•œ ์ž‘์—… ๊ฐ€์ ธ์˜ค๊ธฐ

git strash apply [stash ์ด๋ฆ„]

๋ฐ˜์‘ํ˜•