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=18&rev2=19 TODO: How a record-only merge ("keep-alive dance") enables another reintegrate to work. == Unifying Sync and Reintegrate == + What ''should'' happen if we try to ''sync'' after a ''reintegrate''? + + {{attachment:merge-reint-sync-1.png|svn reintegrate then sync}} + + == The Two Sides of a Merge == TODO: Explain the idea that the result of a 3-way merge from branch A to B, committed as B3, can be seen either as a change on B consisting of the addition of some stuff from A, or can be seen equally validly as the change A2:B3 consisting of the mergeing of recent changes on B into the context of A. The fact that the result was committed on branch B does not matter; the same result could have been committed on branch A, or on both branches.
