报错如下:
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 reset --hard origin/develop
2、保留本地更改
标签:pull,git,because,unfinished,Exiting,merge,GIT,报错 From: https://www.cnblogs.com/aaacarrot/p/17144405.htmlgit merge --abort
git reset --merge