Tree conflicts - resolution.txt

I've been analysing how tree conflicts can be resolved, and written up
the results in notes/tree-conflicts/resolution.txt
<http://svn.collab.net/repos/svn/trunk/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.

Thanks.
- 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