DenkzeitWiki

Merging

• Merging is the key to software developer collaboration

vs. Rebasing

• http://blog.experimentalworks.net/2009/03/merge-vs-rebase-a-deep-dive-into-the-mysteries-of-revision-control/

3-way merging

• http://www.guiffy.com/SureMergeWP.html
  
• Diff Strategies
  • Differential Synchronization
  
  
• http://www.elliecomputing.com/Products/merge_why3way.asp
  • delta(result, ancestor) = delta(set1, ancestor) + delta(set2, ancestor)

Merging between branches

• http://svnbook.red-bean.com/en/1.1/ch04s03.html
  • The reason for bringing this up is to point out an important difference between svn diff and svn merge. The former command ignores ancestry, while the latter command is quite sensitive to it. For example, if you asked svn diff to compare revisions 99 and 102 of foo.c, you would see line-based diffs; the diff command is blindly comparing two paths. But if you asked svn merge to compare the same two objects, it would notice that they're unrelated and first attempt to delete the old file, then add the new file; you would see a D foo.c followed by a A foo.c.
  
  
• http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html#svn.branchmerge.advanced.moves
  • A lesser-known fact about Subversion is that it lacks “true renames”—the svn move command is nothing more than an aggregation of svn copy and svn delete.
  
  
• http://stackoverflow.com/questions/783674/how-to-branch-and-merge-in-tfs
  • The TFS merge engine relies almost entirely on history, not file contents.

• http://weblogs.asp.net/dmckinstry/archive/2006/07/03/Understanding-ChangeSets-and-Merge-with-Team-Foundation-Server.aspx
  • CherryPicking
  
  
• CherryPicking with Mercurial (is not easily possible)
  • http://stackoverflow.com/questions/1670076/in-mercurial-how-do-i-merge-a-single-revision
    • use a patch or the transplant-extension or backout
  • using "backout" is more like keeping the cherries and throwing out the rotten tomatoes [1], [2], [3]
• http://kevin-berridge.blogspot.com/2009/04/what-mercurial-cant-do-merge-by.html
  
• CherryPicking with Git
  • http://www.gitready.com/intermediate/2009/03/04/pick-out-individual-commits.html
  • http://stackoverflow.com/questions/1241720/git-cherry-pick-vs-merge-workflow
    • Please remember that cherry-picked or rebased commit is different from the point of view of Git (has different SHA-1 identifier) than the original, so it is different than the commit in remote repository. (Rebase can usually deal with this, as it checks patch id i.e. the changes, not a commit id).

• http://stackoverflow.com/questions/645008/what-are-the-basic-clearcase-concepts-every-developer-should-know

TeamSystem

• http://blogs.msdn.com/jimlamb/articles/tfsfaq.aspx

 Traditional 3-way merges work the following way:

• http://www.axiscode.com/articles/tfsbranching
  • But TFS does not track file history between branches, so it cannot locate the "common ancestor" necessary for the resulting 3-way merge.
  • Certainly if Alice and Bod had proper foresight, they could have avoided the whole problem simply by creating a parent integration branch above them
  
  
• baseless:
  • a two-way-merge (not a three-way-merge)
  
  
• http://stackoverflow.com/questions/1860736/tfs-merge-best-practices