hg 0.9.3: how do you revert a merge?
Matt Mackall
mpm at selenic.com
Thu Apr 26 00:12:44 CDT 2007
On Thu, Apr 26, 2007 at 01:00:57AM -0400, Allan Wind wrote:
> Along the lines of the unanwered faq question: "My merge program failed,
> and now I don't know what to do". Is the answer not `hg rollback`?
Definitely not.
You can either manually fix up the merge (tricky) or you can redo the
merge:
hg co -C first-revision (warning: clobbers what's currently in your
working directory)
hg merge second-version
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial
mailing list