Upcoming enhancements to VS/TFS merging
Microsoft’s Brian Harry posted another insightful article on a feature in the next version of Visual Studio/Team Foundation Server. Merging code between branches has been widely know to be difficult in the 2005 and 2008 versions. VS/TFS 2010 added branching visualization and new display options with tracking changesets however, I’ve heard grumblings that the merging features aren’t nearly good as Git. Brian’s article discusses how the new merging features compare to those of Git.