Sonntag, Dezember 06, 2009

merge after pull failed

Did a commit on both repositories. The pull worked fine but the needed merge failed with abort: outstanding uncommitted changes. Checked again the status but there was no M. After some reading I encountered that deleted but not removed files ! are ignored by the commit but not by merge.

fix: hg remove <file>

Now the merge run, but let to unresolved merges. After merging the files by hand the commit failed with abort: unresolved merge conflicts. hg resolve -a showed that Mercurial didn't recognise the merges done by hand.

fix: hg resolve -m

This marked all the unresolved merges as resolved. After this the commit worked as expected.