Everything you want to know about Visual Studio ALM and Farming
Brian Harry is a Microsoft Technical Fellow working as the Product Unit Manager for Team Foundation Server. Learn more about Brian.
More videos »
We've gotten feedback that branching, merging and conflict resolution are too complicted today. We are making a series of improvements in our next version of TFS to address these issues. The new history spec we released a couple of months ago demonstrated one piece of our plan - allowing you to easily track a change across branches back to the original checkin that introduced it. Today, we released a new resolve spec that covers improvements to conflict resoluton.
Our resove design is intended to address the following issues:
Here's a screen shot of the new modeless conflict resolution channel in the Pending Changes tool window.
See the spec referenced above for more details and don't forget to provide any feedback at: http://forums.microsoft.com/MSDNWorkShop/ShowForum.aspx?ForumID=1981&SiteID=64