git merge 后出现问题：无法拉取，因为未完成合并并且没有暂存文件

发布于 2025-01-15 15:07:25 字数 636 浏览 2 评论 0 原文

我已经将一个分支合并到 GitHub 上的 master 上，然后想在本地进行 git pull 。当我执行 git pull 时，它要求我提交更改，因此我添加了文件并提交。

但是发生了一些事情，尽管合并已经完成，但我还是陷入了合并的中间。我有一个空的暂存区，当我尝试执行 git pull 时，出现此错误：

❯ git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
❯ git pull --force
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

在我在控制台中按分支名称写入的行上

master merge

有人可以告诉我这里发生了什么以及如何解决此问题吗？谢谢。

原文

I have merged a branch to master on GitHub and wanted to do a git pull locally after that. When I did a git pull it asked me to commit changes, so I have added files and committed.

But something happened, and I am stuck kind of in the middle of the merge, although the merge is completed. I have an empty staging and when I try to do a git pull I get this error:

❯ git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
❯ git pull --force
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

and on the line where I write in the console by the branch name I have