You have not concluded your merge (MERGE_HEAD exists) git拉取失败_git: you have not concluded your merge (merge head

作者：不正经 | 2024-05-22 05:25:19

踩

git: you have not concluded your merge (merge head exists)

今天获取git线上仓库代码报了这个错误:

$ git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
1
2
3

git merge --abort
git reset --merge
1
2

合并后记得一定要提交这个本地的合并
然后在获取线上仓库
git pull

不建议这样做,但是如果你本地修改不大,或者自己有一份备份留存,可以直接用线上最新版本覆盖到本地

git fetch --all
git reset --hard origin/master
git fetch
1
2
3

声明：本文内容由网友自发贡献，不代表【wpsshop博客】立场，版权归原作者所有，本站不承担相应法律责任。如您发现有侵权的内容，请联系我们。转载请注明出处：https://www.wpsshop.cn/w/不正经/article/detail/606606