Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "MergeDev/MergeTheoryTopics" page has been changed by JulianFoad: http://wiki.apache.org/subversion/MergeDev/MergeTheoryTopics?action=diff&rev1=4&rev2=5 Comment: Mention criss-cross and recursive merge == Continue after Conflicts? == Can Svn do more to enable merging to continue after hitting conflicts? Presently it stops at the end of whichever revision range it is processing. + == Criss-Cross & Recursive Merge == + Recursive merge strategy can resolve a criss-cross -- see the explanation linked below. + + How could we implement the "recursive merge" strategy in Subversion? + == References == * Subversion Wiki, Julian Foad, . http://wiki.apache.org/subversion/SymmetricMerge http://wiki.apache.org/subversion/SupportedMergeScenarios + + * How recursive merge resolves a criss-cross -- simple explanation, PlasticSCM blog, + . http://codicesoftware.blogspot.com/2012/01/more-on-recursive-merge-strategy.html * "NewMerge", Assembla, . http://blog.assembla.com/assemblablog/tabid/12618/bid/58122/It-s-Time-to-Fix-Subversion-Merge.aspx
