How to resolve subversion tree conflict: the branch deleted the directory, and the trunk changed the file there

Question

1) I have a connecting line and a branch has been created from it.

2) The line contains directory A, in the branch this directory has been renamed B.

3) Now in the trunk we accidentally made changes to the file F in A.

4) Reintegration of a branch creates a tree conflict

5) By cleaning the bees, I returned the changes to the F file in the trunk - however, this was not a solution, because during the merge the merge is still trying to make the changes, and then returns them. This still leads to conflict.

Question-part A: What is the right solution to solve this situation? Just accept the conflict manually?

Question-Part B: Subversion usually cannot merge files if the file is in a directory that has been renamed to a branch?

(I am using Subversion 1.6 and Tortoise)

Answer 1

Question A: svn resolve --accept=workingand sort it manually, as you said.

Question B: No, it cannot. If anyone knows a solution, I really want to study it.

You can take a look at this post , which also resolves tree conflicts.