Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "SymmetricMerge" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SymmetricMerge?action=diff&rev1=90&rev2=91 Comment: Correct the merge stated for Criss-cross #4. Found by: stefan2/cristian. * Candidate changes are { A2, A3, A4 }. * Target natural history is { B1, B2, B3, B4 }; target mergeinfo is { A1 }. * Notice candidate A3 can be skipped because it represents B1, as before. - * Merge just A2 to B. + * Merge the changes { A2, A4 } to B: that is, two 3-way merges, first { base A1, source-right A2, target B } then { base A3, source-right A4, target B }. === Conclusion about Criss-Cross merges === As noted above, I don't expect Subversion to solve criss-cross cases, at least I put this at a lower priority than 3-branch merge patterns.
