[git] You have not concluded your merge (MERGE_HEAD exists)

[git] You have not concluded your merge (MERGE_HEAD exists)

 

git pull 후 에러메시지

error: You have not concluded your merge (MERGE_HEAD exists).

 

 

해결방법

merge 취소

git merge --abort

 

commit

git status
git commit -m "커밋 내용"

 

git pull

git pull origin master