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=85&rev2=86 That's just like before, so the change B2 doesn't matter. + === Criss-Cross #4: with unmerged logical changes on both sides === + Let's try the same but with changes after the merges as well. + + {{attachment:merge-criss-cross-4.png|criss-cross merge 4}} + + === 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.
