In svn, what is the difference between merging changes from a Branch back to Trunk and reintegrating changes from a Branch to Trunk? Does this result in the same result with no future problems?
Share
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.
In svn, what is the difference between merging changes from a Branch back to Trunk and reintegrating changes from a Branch to Trunk? Does this result in the same result with no future problems?
Reintegration is not separate operation – it’s subtype of merge.
Reintegrate merging is different from the ‘normal’ merging: It carefully replicates only those changes unique to the source Merge From compared to the local working copy (Merge To in common case)
Read also Why is –reintegrate needed for svn 1.5 merging?