git pull 时:
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge问题出现原因:
1-代码冲突,未合并代码就退出了;
2-代码未更新就改了同一个文件同一行
解决方案:
1-终止合并 git merge --abort;
2-恢复合并git reset --merge,重新拉代码git pull