A simple example using branch and mergehttp://blogs.msdn.com/b/buckh/archive/2004/06/14/155417.aspxMerge is an overloaded word. There is a content merge and then there is a branch merge. A content merge is where you have edited a file and someone checked in a newer file, so the source control system will tell you to do a content merge before checkingen-USTelligent Evolution Platform Developer Build (Build: 5.6.50428.7875)TechEd 2008 FAQ: Branching and Merging with Team Foundation Serverhttp://blogs.msdn.com/b/buckh/archive/2004/06/14/155417.aspx#8618075Wed, 18 Jun 2008 22:57:28 GMT91d46819-8472-40ad-a661-2c78acb4018c:8618075Chris Rathjen<p>This was the most popular question asked at our booth (and perhaps all of the VSTS area) at Tech Ed Developers</p> <img src="http://blogs.msdn.com/aggbug.aspx?PostID=8618075" width="1" height="1">A Brief SourceSafe User's Guide to Team Foundation Version Controlhttp://blogs.msdn.com/b/buckh/archive/2004/06/14/155417.aspx#614253Fri, 02 Jun 2006 17:23:25 GMT91d46819-8472-40ad-a661-2c78acb4018c:614253Ed Hintz (MSFT)Moving from one software application to another often results in various &amp;quot;surprises&amp;quot; where the new application...<img src="http://blogs.msdn.com/aggbug.aspx?PostID=614253" width="1" height="1">Some more merge exampleshttp://blogs.msdn.com/b/buckh/archive/2004/06/14/155417.aspx#361926Fri, 28 Jan 2005 00:30:00 GMT91d46819-8472-40ad-a661-2c78acb4018c:361926Chris Rathjen<div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=361926" width="1" height="1">Some more merge exampleshttp://blogs.msdn.com/b/buckh/archive/2004/06/14/155417.aspx#361924Fri, 28 Jan 2005 00:29:00 GMT91d46819-8472-40ad-a661-2c78acb4018c:361924Chris Rathjen<div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=361924" width="1" height="1">Branching and Merging in the Dec. CTPhttp://blogs.msdn.com/b/buckh/archive/2004/06/14/155417.aspx#359473Mon, 24 Jan 2005 17:09:00 GMT91d46819-8472-40ad-a661-2c78acb4018c:359473Buck Hodges<div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=359473" width="1" height="1">Buck's posts on branching and merginghttp://blogs.msdn.com/b/buckh/archive/2004/06/14/155417.aspx#168972Tue, 29 Jun 2004 20:45:00 GMT91d46819-8472-40ad-a661-2c78acb4018c:168972Chris Rathjen<div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=168972" width="1" height="1">Branching, Merging and Unit Testinghttp://blogs.msdn.com/b/buckh/archive/2004/06/14/155417.aspx#155465Tue, 15 Jun 2004 00:55:00 GMT91d46819-8472-40ad-a661-2c78acb4018c:155465Rob Caron's Blog<div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=155465" width="1" height="1">