SVN tree conflict when merging renamed folder

Question

I\'m using TortoiseSVN to merge into branch-B the latest changes from trunk, including a folder rename.

Before that, I reintegrate

Answer 1

There is no really clean way to resolve structural tree conflicts like this in Subversion. Basically, what you need to do is the following:

• merge trunk into branch-B working copy
• manually create a diff of the changes to file1 and file2 in branch-B and apply them to the corresponding files in the newly merged Folder1-Renamed directory
• delete the now obsolete Folder1 directory
• make sure everything still works
• accept the current state as the correct one (see also http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html)
• commit

Sorry, it does not get easier than that with svn. I am a big fan of using Subversion for certain kinds of team setups, but the nightmare of tree conflicts (and their arcane and error prone resolution mechanisms) regularly make we want to cry (and switch to git for good).