【git pull】 error: You have not concluded your merge (MERGE_HEAD exists).
Posted on 2023-09-14 14:04 牛man 阅读(12) 评论(0) 编辑 收藏 举报问题
$ 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、放弃本地更改
git reset --hard origin/develop
2、保留本地更改
git merge --abort
git reset --merge
冲冲冲