[darcs-users] what does "darcs resolve" do?

zooko at zooko.com zooko at zooko.com
Fri Jan 13 14:28:29 UTC 2006


>     zooko> Finally, could "darcs resolve" be renamed to "darcs
>     zooko> mark-conflicts"?
> 
> Please don't, that's inaccurate.  As Jamie explained, resolve handles
> the conflicts according to one of several algorithms.  Marking them is
> only one of the possibilities, and others might be added in the future.

My understanding of what Jamie said was that "darcs resolve" always marks
conflicts, regardless of the --mark-conflicts, --allow-conflicts,
--dont-allow-conflicts settings.  If that's right then it would be better named
"darcs mark-conflicts".

Regards,

Zooko




More information about the darcs-users mailing list