Notice
Recent Posts
Recent Comments
Link
Β«   2024/07   Β»
일 μ›” ν™” 수 λͺ© 금 ν† 
1 2 3 4 5 6
7 8 9 10 11 12 13
14 15 16 17 18 19 20
21 22 23 24 25 26 27
28 29 30 31
Archives
Today
Total
관리 메뉴

lgvv98

[git] 원격 μ €μž₯μ†Œμ—μ„œ λ‚΄μš© λ³€κ²½ ν›„ local μ €μž₯μ†Œλ‘œ pull λ³Έλ¬Έ

git

[git] 원격 μ €μž₯μ†Œμ—μ„œ λ‚΄μš© λ³€κ²½ ν›„ local μ €μž₯μ†Œλ‘œ pull

πŸ₯• 캐럿맨 2021. 11. 30. 01:31

βœ… 원격 μ €μž₯μ†Œμ—μ„œ README.md νŒŒμΌμ„ 직접 λ³€κ²½ν•œ ν›„, 둜컬 μ €μž₯μ†Œμ— λ°˜μ˜ν•˜λŠ” 법에 λŒ€ν•΄μ„œ μ•Œμ•„λ³Ό μ˜ˆμ •μ΄μ•Ό.

 

원격 μ €μž₯μ†Œμ— μ ‘κ·Όν•˜κΈ° μœ„ν•΄ 원격 μ €μž₯μ†Œ λ‚΄μš© μ—…λ°μ΄νŠΈ ν›„, git pull

$ git remote update

 

$  git stash
$ git pull

 

git stashλŠ” 1λ²ˆμ΄ν›„ 3번(2λ²ˆμ„ κ±΄λ„ˆλ›°κ³ ) μ‹€ν–‰ν–ˆμ„ μ‹œ, 

error: Your local changes to the following files would be overwritten by merge:
	README.md
Please commit your changes or stash them before you merge.
Aborting

μœ„μ™€ 같은 μ—λŸ¬κ°€ λ‚˜λ©΄ 2λ²ˆμ„ λ„£μ–΄μ„œ μ²˜λ¦¬ν•΄μ£Όλ©΄ 끝

Comments