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?
Asked
Active
Viewed 158 times
2
-
Question has already been answered on stack overflow - http://stackoverflow.com/questions/6575325/svn-merge-a-range-of-revisions-vs-reintegrate – General_9 Apr 02 '12 at 12:38
1 Answers
1
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)
Lazy Badger
- 94,711
- 9
- 78
- 110