Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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?
What you can do to resolve your conflict is
where
<path>is where you have your conflict (can be the root of your repo).Explanations:
resolveaskssvnto resolve the conflictaccept workingspecifies to keep your working files-Rstands for recursiveEDIT:
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)svn switchcommandSwitch working copy to new branch/tagoption at branch creation