如何结束你的文件合并？ [英] How to conclude your merge of a file?

问题描述

在Git中合并了一个文件后，我尝试拉取存储库，但出现错误：

After I merged a file in Git I tried to pull the repository but error came up:

您尚未完成合并。 （MERGE_HEAD存在）

You have not concluded your merge. (MERGE_HEAD exists)

如何得出合并结果？

How does one conclude a merge?

推荐答案

检查存储库的状态（ git status ）。应该添加每个未合并文件（在你自己解决conficts之后）（ git add ），如果没有未合并文件，你应该 git commit

Check status (git status) of your repository. Every unmerged file (after you resolve conficts by yourself) should be added (git add), and if there is no unmerged file you should git commit

这篇关于如何结束你的文件合并？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！