How can I combine two heads in Hg now?

Question

I have read a lot of posts already, and it seems like no one can help.

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 

I tried this, which marks each as allowed. I think

 hg resolve -m webclient/profile_models.log etc 

and then upgrade again but not working. It still tells me

 abort: outstanding uncommitted merges 

This is my hg summary

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

My colleague pushed one, and I just clicked another. How do I solve this problem? Thanks.

---

These magazines are no longer needed. In fact, in my push, I deleted them because I put them in a directory called "logs" .

Answer 1

After the merge is resolved, you must commit before upgrading.

Every time you merge, you must do before you do anything else. So just hg commit , give some meaningful commit message, and you can continue your work.