Git 出错error: Pulling is not possible because you have unmerged files

在git pull的过程中，如果有冲突，那么除了冲突的文件之外，其它的文件都会做为staged区的文件保存起来。

重现：

$ git pull origin master

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

通过git status你会发现下面古怪的事情：

$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 7 different commits each, respectively.(use "git pull" to merge the remote branch into yours)You have unmerged paths.(fix conflicts and run "git commit")(use "git merge --abort" to abort the merge)Changes to be committed:modified:   CMakeLists.txtmodified:   builtin_op_importers.cppUnmerged paths:(use "git add <file>..." to mark resolution)both modified:   plugin_op/onnx_plugin/PRelu_Plugin.cuUntracked files:(use "git add <file>..." to include in what will be committed)debug/

本地的push和merge会形成MERGE-HEAD(FETCH-HEAD), HEAD（PUSH-HEAD）这样的引用。HEAD代表本地最近成功push后形成的引用。MERGE-HEAD表示成功pull后形成的引用。可以通过MERGE-HEAD或者HEAD来实现类型与svn revet的效果。

解决：

1.将本地的冲突文件冲掉，不仅需要reset到MERGE-HEAD或者HEAD,还需要–hard。没有后面的hard，不会冲掉本地工作区。只会冲掉stage区。

git reset --hard FETCH_HEAD

2.git pull就会成功。

Git 出错error: Pulling is not possible because you have unmerged files相关推荐

git pull 报错：error: Pulling is not possible because you have unmerged files.
报错: $ git pull error: Pulling is not possible because you have unmerged files. hint: Fix them up in ...
git合并分支Pulling is not possible because you have unmerged files.
问题:目前在master分支上,执行git merge 分支A 报错error: Pulling is not possible because you have unmerged files. 解决 ...
error: Pulling is not possible because you have unmerged files
git pull的时候出现如下的错误: 错误:无法提取,因为您有未合并的文件. 解决方案一(不推荐): 本地的push和merge会形成MERGE-HEAD(FETCH-HEAD), HEAD(PUS ...
git pull报错Pulling is not possible because you have unmerged files
git pull 报错 error: Pulling is not possible because you have unmerged files. 解决办法 1. git add -u 2. gi ...
git pull 拉取代码的时候报错 Pulling is not possible because you have unmerged files.
项目场景: git pull 拉取代码的时候报错 Pulling is not possible because you have unmerged files. 解决方案: 1. git add - ...
Pulling is not possible because you have unmerged files
Pulling is not possible because you have unmerged files 已经解决:请看error:failed to push some refs to 'xx ...
【git】git下拉项目Pulling is not possible because you have unmerged files解决方案
✨踩坑不易,还希望各位大佬支持一下\textcolor{gray}{踩坑不易,还希望各位大佬支持一下}踩坑不易,还希望各位大佬支持一下
Pulling is not possible because you have unmerged files.
git add . git commit -m '' git pull
Couldnt check the working tree for unmerged files because of an error. bad signature index file cor
git 提交代码 Couldn't check the working tree for unmerged files because of an error. bad signature 0x000 ...

Git 出错error: Pulling is not possible because you have unmerged files

Git 出错error: Pulling is not possible because you have unmerged files相关推荐

最新文章

热门文章