[darcs-devel] [issue2495] behavior when conflicts are detected on push or pull

Guillaume Hoffmann bugs at darcs.net
Sat Apr 9 20:21:48 UTC 2016


Guillaume Hoffmann <guillaumh at gmail.com> added the comment:

I agree we should improve on the current situation.

We have a dormant patch for the command "darcs undo", which would be
an alternative to the prompt/menu you propose: enable the user to
restore their repository to the pre-pull state.  See
http://bugs.darcs.net/patch1182 .

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


More information about the darcs-devel mailing list