fatal: You have not concluded your merge (MERGE_HEAD exists).
原因:以前的pull之后merge失败, git进入conflict状态。
解决方法:
git merge --abort
git reset --merge
git merge …(你要合并的分支)
这时如果出现以下提示:git中Please enter a commit message to explain why this merge is necessary.Please enter a commit message to explain why this merge is necessary.
1.按键盘左上角"Esc"
2.输入":wq",注意是冒号+wq,按回车键即可