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 이름]

λ°˜μ‘ν˜•