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=64&rev2=65 If we don't automatically detect and select the good base, then criss-cross merges would sometimes work and sometimes not, with little clue as to why. - It seems like there must be more complex cases in which neither base will work. + It seems like there must be more complex cases in which neither base will work. Let's try the same but with a change in B as well. {{attachment:merge-criss-cross-3.png|criss-cross merge 3}} @@ -310, +310 @@ * Notice candidate B1:A3 represents logical changes { A1, A2 }. A1 is already on B; A2 isn't. Therefore we can neither merge nor skip this change. * Bail out, telling the user there's a problem. - So the change B2 doesn't matter. + That's just like before, so the change B2 doesn't matter. ---- = Appendices =
