๋ณธ๋ฌธ ๋ฐ”๋กœ๊ฐ€๊ธฐ

Error

[Git] Pulling is not possible because you have unmerged files.

728x90

 Pulling is not possible because you have unmerged files.

Umerged paths:

์—์„œ ๋ณ€๊ฒฝ๋œ ์‚ฌํ•ญ์„ ๋กœ์ปฌ์— ์ €์žฅํ•˜์ง€ ๋ชปํ•œ ์ƒํƒœ์—์„œ pushํ•ด์„œ ๋‚˜๋Š” ์˜ค๋ฅ˜์ด๋‹ค.

 

ํ•ด๊ฒฐ๋ฐฉ๋ฒ• : git add CNAME

 

๊ฐ•์ œ ํ•ด๊ฒฐ ๋ฐฉ๋ฒ• : git push -f origin