oh-my-zsh error 썸네일형 리스트형 Oh My Zsh 에러 Oh My Zsh(oh-my-zsh) 에러 error: Pulling is not possible because you have unmerged files. (병합되지 않은 파일이 있기 때문에 끌어오기가 불가능합니다.) git pull > git pull error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. git reset --hard HE.. 더보기 이전 1 다음