How to abort a merge in mercurial?

version-control mercurial merge dvcs undo
deft_code picture deft_code · Oct 20, 2010 · Viewed 28.9k times · Source

I goofed up a merge. I'd like to revert then try again.
Is there a way to revert a merge before it is committed?

hg revert doesn't do what I'd like, it only reverts the text of the files. Mercurial aborts my second attempt at merging and complains original merge is still uncommitted.

Is there a way to undo a merge after an hg merge command but before it's committed?

Answer

Omnifarious picture Omnifarious · Oct 20, 2010

hg update -C <one of the two merge changesets>

Related questions

How and/or why is merging in Git better than in SVN?

I've heard in a few places that one of the main reasons why distributed version control systems shine, is much better merging than in traditional tools like SVN. Is this actually due to inherent differences in how the two systems …

Read More
What's the easiest way to commit and push a single file while leaving other modifications alone?

I'm relatively new to Mercurial and my team is trying it out right now as a replacement for Subversion. How can I commit and push a single file out to another repository while leaving other modifications in my working directory …

Read More
What is the Difference Between Mercurial and Git?

I've been using git for some time now on Windows (with msysGit) and I like the idea of distributed source control. Just recently I've been looking at Mercurial (hg) and it looks interesting. However, I can't wrap my head around …

Read More