[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Tree conflicts - resolution.txt

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 10 Jun 2008 22:14:45 +0100

I've been analysing how tree conflicts can be resolved, and written up
the results in notes/tree-conflicts/resolution.txt

I list two main things for each type of tree conflict:

  * How I think the working copy should be left by Subversion when the
conflict is raised.

  * How a user is likely to want to resolve the conflict, for some
likely use cases.

The former will guide that aspect of the implementation, and the latter
is intended to provide written recipes that a user can follow for all
the common cases that are not simply "choose theirs" or "choose mine".

I'd very much appreciate anyone's read-through and comments on it.

- Julian

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-10 23:15:07 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.