CODEWITHSUNDEEP
tfs
Neil Walker
Neil Walker

Reputation: 6848

Find what 'automatically resolved' conflicts were made in TFS

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.

Upvotes: 8

Views: 2789

Answers (2)

TTT
TTT

Reputation: 28934

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.

Upvotes: 9

MrHinsh - Martin Hinshelwood
MrHinsh - Martin Hinshelwood

Reputation: 23434

Those files are still checked out. If you compare your local version to the server version you should see the diff.

Upvotes: -1

Related Questions