Tree Conflict Resolution

Question

How to resolve a tree conflict in the current scenerio.

C:\DevBranch C:\MyBranch 

I updated both branches. Edited MyBranch and then passed it back. Now you want to merge these changes into DevBranch. When I do a merge, I get "Tree Conflicts"

 The last merge operation tried to add the file 'abc.def', but it was already added locally. How do you want to resolve this conflict? Keep the file from repository Keep the local file 

How can i decide?

Answer 1

What can you do to resolve the conflict,

 svn resolve --accept working -R <path> 

where <path> is where you have the conflict (maybe the root of your repo).

Explanations:

• resolve asks svn to resolve the conflict
• accept working points to saving your work files
• -R stands for recursive

Hope this helps.

EDIT:

To summarize what was said in the comments below:

• <path> must be a directory in conflict ( C:\DevBranch\ in case of OP)
• It is likely that the origin of the conflict
  • either using the svn switch
  • or checked the option Switch working copy to new branch/tag when creating a branch
• More information on conflicts can be found in the highlighted section of the Tortoise documentation .
• To be able to run the command, you must have CLI tools installed along with Tortoise:

Answer 2

Essentially, tree conflicts arise if some restructuring occurs in the folder structure of the branches. You need to delete the conflict folder and use svn clean once. Hope this resolves your conflict.