Exiting because of unfinished merge.

版权声明：本文为博主原创文章，未经博主允许不得转载。 https://blog.csdn.net/chinafire525/article/details/83505864

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

1.保留你本地的修改

git merge --abort

git reset --merge

合并后记得一定要提交这个本地的合并（add-->commit-->push-->pull）

然后在获取线上仓库

git pull