Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "SvnMergeTheory" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=2&rev2=3 {{attachment:merge-sync-1-svn.png|svn sync merge}} (The arcs that start with a circle and end with a T-shaped bar represent the span of the source side of the merge.) + + What if, instead of a second sync merge, at that point we try a reintegrate instead? + + {{attachment:merge-reint-1.png|svn sync merge}} + + The only significant difference is that Subversion selects a base node that is on the ''target'' branch rather than on the ''source'' branch. == 3-way merge == {{{#!wiki comment
