Git:"Pull is not possible because you have unmerged files"
0
悬赏园豆：50
[已解决问题]
解决于 2011-09-13 13:18
在git pull操作时，遇到这样的错误提示：
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
运行git status，发现unmerged文件如下：
如何解决这个问题？
最佳答案
0
git commit -a提交再push。
收获园豆：50
其他回答(2)
0
git reset --hard head
0
你的代码是不是冲突了？一般情况下是会自动合并的。或者，你是否使用分支开发，推送的时候，分支不对
