Would it make you less nervous if there was a possibility in
_darcs/prefs to declare a repository conflictless?(...)

I think marking "stable" repositories might be useful in other manners as well.(...)

Another tactic would simply be to use a "Are you sure you want to allow conflicts?" prompt _in the event of conflicts_ akin to the "Are you sure you want to revert?"; (...)

Or, yet: what if all patches had an 'active' flag? Everytime
we push or pull a patch to a repo those patches would by
default have 'active' off. Then we could, when we want to,
activate each or all of them, solving conflicts as they
arrive as patches be activated.

Maurício

_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to