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

[Ben Franksen]

New submission from Ben Franksen <benjamin.franksen at helmholtz-berlin.de>:

When darcs encounters conflifts during push or pull, it should offer the
user a choice

 * quit the operation (this is almost always what I want)

 * markup the conflicts

 * suspend the local (when pulling) or remote (when pushing) conflicting
patches, that is, decay into rebase pull or rebase push, respectively.

----------
messages: 19076
nosy: bf
priority: wishlist
status: unknown
title: behavior when conflicts are detected on push or pull
topic: Conflicts, UI

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