You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by Apache subversion Wiki <co...@subversion.apache.org> on 2012/02/27 13:57:56 UTC

[Subversion Wiki] Trivial Update of "SymmetricMerge" by JulianFoad

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=47&rev2=48

  == Unifying Sync and Reintegrate ==
  What ''should'' happen when we try another merge after a ''reintegrate''?
  
+ [Note: the bend in the 'reint' arrow is just an oddity of the graph drawing program; it doesn't mean anything special.]
+ 
  {{attachment:merge-reint-reint-1.png|svn reintegrate then reintegrate}}
  
  {{attachment:merge-reint-sync-1.png|svn reintegrate then sync}}