[darcs-users] --mark-conflicts

Dan Pascu dan at ag-projects.com
Fri Mar 6 16:34:09 UTC 2009

On Friday 06 March 2009, Eric Kow wrote:
> Anyway there seems to be a consensus that implementing the flags
> is OK for those who "know better".  It makes me nervous, but I won't
> fight it...

I do not claim to know better in this case. In fact I have not encountered 
so far a single case where I would want to allow conflicts when I push. 
OTOH, I see no reason to deny this ability to those who indeed "know 
better" because they have a use case that is more difficult without it. 
After all it's their repository and they can't blame darcs for pushing 
conflicts into a remote repository because they chose to allow it 

As long as the default for push is --dont-allow-conflicts, I see no harm 
in such a move and it also doesn't make me nervous, because I know I 
won't change that default (at least not until I will discover a use case 
for it, in which case I should know exactly why I need it and what to 
expect from it).


More information about the darcs-users mailing list