> Also +1 for a --dont-allow-conflicts default for both commands. +1, as I've said before I think darcs should always warn about conflicts and stop, by default.