git中遇到的错误记录You have not concluded your merge (MERGE_HEAD exists)

如需转载分享，请标明出处，且不用于盈利为目的，谢谢合作！git中遇到的错误记录You have not concluded your merge (MERGE_HEAD exists错误：You have not concluded your merge (MERGE_HEAD exists)解决：方法1.（推荐）保留本地的修改git merge --abortgit reset --mergeg

এ某年某月某日এ

423人浏览 · 2020-07-16 20:33:45

এ某年某月某日এ · 2020-07-16 20:33:45 发布

如需转载分享，请标明出处，且不用于盈利为目的，谢谢合作！

git中遇到的错误记录You have not concluded your merge (MERGE_HEAD exists

错误：You have not concluded your merge (MERGE_HEAD exists)
解决：
方法1.（推荐）
保留本地的修改
git merge --abort

git reset --merge

git commit -m "描述"

git pull

git push
方法2.（不推荐）不建议这样做,但是如果你本地修改不大,或者自己有一份备份留存,可以直接用线上最新版本覆盖到本地
git fetch --all

git reset --hard origin/master

git fetch