Conflict Resolution in TFS 2010
Posted: Monday, November 09, 2009 3:00 PM
by
dave
Filed under: VS2010
The conflict resolution in previous versions of VSTS/TFS worked ok, but did not have the best user experience for the developer. When a conflict was detected on check in a modal dialogue was dispatched and the developer could resolve the conflicts from there. However getting to all the information you required to resolve the conflict was not at hand.
In TFS 2010 when you attempt to check in a conflict VS behaves the way it does when you have violated a Check in Policy. One mark for consistency. You will get a warning message as seen below.
Then you will be redirected to the Pending Changes - Conflicts Tab.
From the conflicts tab you can get at the information you need to help you resolve the conflict.
Compare – Compare the local file with the latest version in source control.
History – See the complete history of all changes to this file.
Annotate – Shows you the source file with change set information in the margin. Including who made the change and when.
Once you know what you need to do, click on the expander for a file and select how you want to resolve this conflict. You can AutoMerge, use the Merge Tool to edit the source, or simply select the server version or the local version.
Happy Merging!
If you would like to receive an email when updates are made to this post, please register here