I have a branch in which a folder was renamed. Now i'm trying to merge changes from trunk to this branch, but the files modified in the trunk are still under the original folder name, so svn throws a tree conflict. How can i resolve this?
The folder was renamed using svn rename.