On Thu, Jan 17, 2013 at 02:55:50PM +0100, Stefan Sperling wrote: > What would also help is some UI design that specifies which kinds of > tree conflicts we expect 1.8 to resolve automatically during 'svn > resolve', and how such cases are resolved depending on what options > the user is choosing.
Actually, UI design is only part of this. Another part is behavioural specification for several tree conflict resolution cases. The UI design should follow from there.