84

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?

coure2011
  • 34,326
  • 71
  • 200
  • 319

2 Answers2

169

What you can do to resolve your conflict is

svn resolve --accept working -R <path>

where <path> 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:

  • <path> 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:

Command line client tools

Yannick Blondeau
  • 8,867
  • 7
  • 48
  • 67
  • what should be path? C:\DevBranch or C:\MyBranch? – coure2011 Sep 24 '12 at 06:56
  • 2
    It should be `C:\DevBranch`. BTW, did you use the `svn switch` command on one of these two folders? – Yannick Blondeau Sep 24 '12 at 07:26
  • 1
    I think while creating branch I used "switch working directory' – coure2011 Sep 24 '12 at 09:41
  • @Luke You can do it like this if you installed the CLI tools together with Tortoise. Just `cd` to your working copy's root and execute `svn resolve --accept working -R ./`. If you need more information on doing this with Tortoise, you can check the [dedicated section](http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-conflicts.html) of the documentation... Hope this helps! – Yannick Blondeau Jul 08 '13 at 20:50
0

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.

Ujjwal Raj Shah
  • 1
  • 2