[darcs-devel] [issue1429] wish: darcs push --allow-conflicts and --mark-conflicts

[Ben Franksen]

Ben Franksen <benjamin.franksen at bessy.de> added the comment:

Quick summary of the email thread:

No one wants to change the default no-conflicts for push, some even 
argue for making it the default for pull (they may have a point, but 
this is another issue). All participants except one argue for adding 
the flags as (non-default) options to push. Rationale: (1) if you 
explicitly say you want to allow conflicts you must know what you are 
doing; (2) there are certain work flows where going to the other repo 
and pulling from there is inconvenient or even difficult.

----------
nosy: +bfr

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