[darcs-users] --mark-conflicts

Florent Becker florent.becker at ens-lyon.org
Fri Mar 6 17:39:36 UTC 2009

> 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...

Would it make you less nervous if there was a possibility in
_darcs/prefs to declare a repository conflictless? That is
push/apply/pull --mark-conflicts into that repo would give an error
like: "this is a clean repository, I won't apply a conflicting patch
here. Please fix the conflict in another repo and re{pull/push/apply}."


More information about the darcs-users mailing list