CODEWITHSUNDEEP
svnversion-controlmergereintegration
General_9
General_9

Reputation: 2319

Merging vs Reintergration

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?

Upvotes: 2

Views: 159

Answers (1)

Lazy Badger
Lazy Badger

Reputation: 97282

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?

Upvotes: 1

Related Questions