revert conflict without losing non-committed changes

[Dirk Heinrichs]

Am 02.08.2014 um 13:46 schrieb anatoly techtonik:
>   $ hg up default
>   merging spyderlib/spyder.py
>   merging spyderlib/spyder.py failed!
>   0 files updated, 0 files merged, 1 files removed, 1 files unresolved
>   use 'hg resolve' to retry unresolved file merges
>
> Damn, I don't want to resolve anything.

But you need to. There's a merge conflict.

> Is there any way to get back and understand what will happen
> with my files exactly?

Yes. Abort/undo the merge, change your configuration to use a graphical
merge tool (kdiff3, meld, ...), then do the merge again. The graphical
merge tool will let you resolve the merge conflicts one by one, with the
code of all three contributors right in front of you.

HTH...

    Dirk
-- 

*Dirk Heinrichs*, Senior Systems Engineer, Engineering Solutions
*Recommind GmbH*, Von-Liebig-Straße 1, 53359 Rheinbach
*Tel*: +49 2226 1596666 (Ansage) 1149
*Email*: dhs at recommind.com <mailto:dhs at recommind.com>
*Skype*: dirk.heinrichs.recommind
www.recommind.com <http://www.recommind.com>



http://www.recommind.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140804/2ffddbd8/attachment-0002.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Logo.gif
Type: image/gif
Size: 1537 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140804/2ffddbd8/attachment-0002.gif>