GIT合并错误“提交不可能，因为您有未合并的文件” [英] GIT merge error "commit is not possible because you have unmerged files"

问题描述

所以我在编辑它之前忘了拉我的代码，然后当我提交新代码并试图推送时，我得到了错误推送是不可能的，那时我做了一个git pull，它使得某些文件冲突突出。我删除了冲突，但我不知道该怎么做。

so I forgot to pull my code before editing it and then when I committed the new code and tried to push, I got the error push is not possible, at that point I did a "git pull" which made some files with conflict highlighted. I removed the conflicts but I don't know what to do from here..

我尝试了 git commit 但它说提交是不可能的，因为你有未合并的文件

I tried to git commit again but it says "commit is not possible because you have unmerged files"

推荐答案

如果你已经修复了需要添加的冲突文件到 git添加[文件名] 的阶段，然后正常提交。

If you have fixed the conflicts you need to add the files to the stage with git add [filename], then commit as normal.

这篇关于GIT合并错误“提交不可能，因为您有未合并的文件”的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！