[darcs-users] User interface for conflicts: confusing enough to lose data

[David Brown]

On Tue, Jun 29, 2004 at 06:42:13AM -0400, David Roundy wrote:

> I'm not sure what diff3 style looks like but the trouble with marking
> conflicts in darcs is that it's possible to have an N-way conflict, so
> CVS-style marking isn't sufficiently general.  The other problem is that
> we have no way of knowing when doing the marking which is "our" change and
> which is "their" change.

Perforce marks the conflicts with "ours" and "theirs", and it is wrong
about 50% of the time.  The terminology ends up being much worse than
just calling them A and B, since it is misleading.

Dave Brown