mercurial - 我现在如何 merge Hg 中的两个头？

Question

我已经读了很多帖子，但似乎没有一个能提供帮助。

yeukhon@glasslab:~/hg/graphyte-webclient/webclient/apps$ hg merge
merging .hgignore
merging webclient/codebundle_ldap.log
warning: conflicts during merge.
merging webclient/codebundle_ldap.log failed!
merging webclient/codebundle_lib.log
warning: conflicts during merge.
merging webclient/codebundle_lib.log failed!
merging webclient/graphyte_lib.log
warning: conflicts during merge.
merging webclient/graphyte_lib.log failed!
merging webclient/profile_models.log
warning: conflicts during merge.
merging webclient/profile_models.log failed!
30 files updated, 1 files merged, 0 files removed, 4 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

我尝试了这个，我认为这将每个标记为已解决

hg resolve -m webclient/profile_models.log 
etc

然后再次更新，但不起作用。它仍然告诉我

abort: outstanding uncommitted merges

这是我的 hg 摘要

yeukhon@glasslab:~/hg/graphyte-webclient/webclient/apps$ hg summary
parent: 106:5082a4f13c33 tip
 merged with yeukhon's repo
parent: 96:0e3cfc289a18 
 Put logs into one directory called logs.
branch: default
commit: 35 modified, 4 unresolved (merge)
update: (current)

我的同事推了一个，我刚刚推了另一个。我该如何处理这个问题？谢谢。

<小时/>

不再需要这些日志。事实上，在我的推送中，我删除了它们，因为我将它们放在名为 "logs" 的目录中。

Answer 1

解决 merge 问题后，您必须在再次更新之前执行提交。

每次 merge 时，您都必须在执行其他操作之前提交。因此，只需执行 hg commit，给出一些有意义的提交消息，您就可以继续您的工作。