Menu
When checking in files into TFS I sometimes get an 'automatically resolved' message:
No files checked in due to conflicting changes. These conflicting changes have been automatically resolved. Please try the check-in again.
I know I can turn off automatic resolution, but I don't mind this being on. However sometimes I want to know exactly what it did to resolve these issues.
Is there a way to get a list of these differences so I can check them before clicking check-in again?
Thanks.
965
If there are any merge conflicts when you're pulling changes or trying to merge two branches, Visual Studio lets you know in the Git Changes window, in the Git Repository window, and on any files that have conflicts. The Git Changes window shows a list of files with conflicts under Unmerged Changes.
In the Branches view of Team Explorer, checkout the target branch. Then right-click the source branch and choose Merge From. Verify the merge options and then click Merge. Visual Studio will notify you if Git halted the merge due to conflicts.
The easiest way I've found to accomplish this is to look at the Output Window, select "Source Control - Team Foundation", and scan the list for all files that were automatically resolved. Then for each file you can view history on the file in question, and look at the recent changes.
98
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
