You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
解决方法:放弃本次merge操作,然后重新pull代码,手动修改冲突代码,合并上传。
git merge --abort // 终止合并
git reset --merge // 重置合并
git pull // 重新拉取代码
