subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache subversion Wiki <comm...@subversion.apache.org>
Subject [Subversion Wiki] Update of "SymmetricMerge" by JulianFoad
Date Wed, 18 Apr 2012 14:06:59 GMT
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=87&rev2=88

Comment:
Start a 'References' appendix.

  
  ----
  = Appendices =
+ == References ==
+ http://www.perforce.com/sites/default/files/convergence-divergence-merging-wingerd.pdf
+ 
+ Particularly slide 20, "The effect of 'edit' arrows", which is showing how merging "up"
does not necessarily guarantee convergence (that is, make the content of the target branch
look just like the source branch), even if the source branch has just been synced from the
target.
+ 
  == Origin of a Branch ==
  As indicated in the quote by Brane at the top of this page, it shouldn't make any difference
in theory whether you branched B from A:
  

Mime
View raw message