[Subversion Wiki] Update of "SvnMergeTheory" by StefanSperling

[Apache subversion Wiki <co...@subversion.apache.org>]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.

The "SvnMergeTheory" page has been changed by StefanSperling:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=36&rev2=37

Comment:
add link to diff3 paper

  What's the difference between 'sync' and 'reintegrate' merges in Subversion?  Could a single algorithm serve both purposes?  How do 'cherry-pick' merges fit in?
  
  <<TableOfContents(2)>>
+ 
+ == Background on 3-way merging ==
+ 
+ The following sections assume that the reader understands how the diff3 algorithm works. The diff3 algorithm is used to perform a merge between an original version of a file and two different versions of the file, each derived from the original version (in Subversion, the derived versions are often referred to as "mine" and "theirs"). This paper provides an explanation and an analysis of the diff3 algorithm: http://www.cis.upenn.edu/~bcpierce/papers/diff3-short.pdf
  
  == Playing catch-up with Sync and Reintegrate ==
  Brane wrote: