[darcs-devel] [issue1649] impossible to resolve conflict by reversion

Petr Ročkai bugs at darcs.net
Fri Oct 16 13:14:18 UTC 2009


New submission from Petr Ročkai <me at mornfall.net>:

It turns out it's not quite possible to resolve a conflict by going to the
version before the conflict using standard constructs. First try: darcs rec: No
changes!. Another: darcs rec --ask: can't select both conflicting sides. The
only way out is darcs tag (that actually works, somewhat contrary to
intuition), but is still something I'd rather not do.

----------
messages: 8961
nosy: darcs-devel, dmitry.kurochkin, mornfall
priority: bug
status: unknown
title: impossible to resolve conflict by reversion

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1649>
__________________________________


More information about the darcs-devel mailing list