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.
Im using the TSVN Gui on windows, and I’ve got a local copy of trunk.
I click merge and select the branch I want to merge with…
but I keep getting conflicts and neither the local or repository version of the files is right after resolving the conflicts…
this lead me to believe that Im merging this backwards.
So I tried to start with the branch and did the merge (reintegrate) and picked trunk from the repos.
Neither of these are working nicely.
Any thoughts?
You should merge all changes from trunk to branch, before merging branch back to trunk.