現在我該如何合併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 

這是我總結的汞

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，給一些有意義的提交信息，你就可以繼續工作。