Resolving tree conflict

Question

How to resolve tree conflict in current scenerio   C  DevBranch C  MyBranch   I updated both branches  Edited MyBranch and then committed back  Now want to merge those changes into DevBranch  When I am doing the merge I am getting  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 resolve

User · Answer

Basically  tree conflicts arise if there is some restructure in the folder structure on the branch  You need to delete the conflict folder and use svn clean once  Hope this solves your conflict

User · Answer

What you can do to resolve your conflict is  svn resolve --accept working -R  lt path gt    where  lt path gt  is where you have your conflict  can be the root of your repo    Explanations    resolve asks svn to resolve the conflict accept working specifies to keep your working files -R stands for recursive   Hope this helps   EDIT   To sum up what was said in the comments below     lt path gt  should be the directory in conflict  C  DevBranch  in the case of the OP  it s likely that the origin of the conflict is   either the use of the svn switch command or having checked the Switch working copy to new branch tag option at branch creation  more information about conflicts can be found in the dedicated section of Tortoise s documentation  to be able to run the command  you should have the CLI tools installed together with Tortoise

[svn] Resolving tree conflict

Examples related to svn

Examples related to tortoisesvn

Examples related to tree-conflict