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.
I am supposed to publish my changes to trunk. I am using a branch X. I am a beginner to SVN.
I want to do that like this:
Is it OK?
Thank you
caveat: I haven’t used SVN for a while!
I think what you suggest will work ok if you specify the relevant revision range for the merge but I always find it easier to do a merge and reintegration on a branch.
You should be merging trunk into your branch regularly and then use the reintegrate option to bring trunk up to date with the branch code once the branch is finished with.
This way you deal with conflicts in the branch, and on a regular basis so the conflicts are usually easier to deal with.