Resolving tree conflict
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
askssvn
to resolve the conflictaccept 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
- either the use of the
- 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: