Search code examples
mercurialmergedvcsconflict

How to resolve merging conflicts in Mercurial (v1.0.2)?

I have a merging conflict, using Mercurial 1.0.2:

merging test.h
warning: conflicts during merge.
merging test.h failed!
6 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 19
  hg merge 18

I can't figure out how to resolve this. Google search results instruct to use:

hg resolve

but for some reason my Mercurial (v1.0.2) doesn't have a resolve command:

hg: unknown command 'resolve'

How can I resolve this conflict?

Solution

  • Valid for hg < v1.1 only

    There is no need to call any hg commands. Unlike svn, Mercurial does not track conflicted files. If you call hg status, you'll see that the file is simply marked as modified.

    Just fix the file by hand and commit.