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=9&rev2=10 What if, instead of a second sync merge, at that point we try a reintegrate instead? - {{attachment:merge-reint-1.png|svn sync merge}} + {{attachment:merge-reint-1.png|svn reintegrate merge}} The main significant difference is that Subversion selects a base node that is on the ''target'' branch rather than on the ''source'' branch. @@ -59, +59 @@ For a ''cherry-pick'' merge, a 3-way merge is not quite right, and a [[http://svn.apache.org/viewvc/subversion/trunk/notes/variance-adjusted-patching.html|4-way merge]] would be more correct. - [TODO: diagram of cherry-pick as 4-way merge] + {{attachment:merge-cherry-1.png|Cherry-Pick as 4-way Merge}} == Drawing Merge Graphs == The graphs in this page are constructed with the program [[http://svn.apache.org/viewvc/subversion/trunk/tools/dev/merge-graph.py|merge-graph.py]] from configuration files such as [[attachment:merge-reint-1.txt]].
