Search code examples
mercurialbranch

Mercurial undo merge that has more commits following it?

Have a scenario where we un-intentionally merged a named branch (ABC) into our default branch.

hg rollback is not an option because there have been a couple commits since.

Is there a way to undo this?

Solution

  • If you haven't publish the repo publicly you can do this

    hg clone -r (parent1 of bad merge) -r (parent2 of bad merge) old new

    and delete the old repo.