On Tue, May 24, 2011 at 05:05:43PM +0200, Stefan Sperling wrote: > In short, whatever works for you is best :)
That said, our goal is to ultimately provide automated resolution of trivial tree conflicts, and interactive menus for resolving more complicated ones. The plumbing isn't yet advanced enough to allow us to implement this, but we're working towards that and Subversion 1.7 is taking a great leap forward. I tentatively expect some visible improvements to happen in Subversion 1.8.
