RE: How about a troubleshooting guide for tree conflicts?
From: Andrew Reedick <Andrew.Reedick_at_cbeyond.net>
Date: Fri, 30 Aug 2013 09:22:14 -0400
> -----Original Message-----
> The SVN Book has a short chapter about tree conflicts which I wrote:
How about we start with a list of the possible error messages? =)
IME, a merge conflict means you, the user, have to manually recreate the tree via svn copy, svn mv, etc. commands. Which is a *huge* perception/paradigm change from how file merges are handled. Meaning, tree conflicts have zero automation/help from svn. Once you accept that, and learn how to read the messages, tree conflicts aren't that mysterious anymore.
This is an archived mail posted to the Subversion Users mailing list.