我现在如何合并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

解决合并后，您必须先执行commit再重新更新。

每次合并时，您必须在执行任何其他操作之前提交。所以只需要hg commit，提供一些有意义的提交信息，您就可以继续工作了。