“Subversion isn't smart enough to do this work for you, so you need to migrate your changes manually.” Sad panda http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html

First published on twitter (?)