CODEWITHSUNDEEP
tfs
Nathan
Nathan

Reputation: 6531

TFS Check which files have been manually merged

A merge has been completed in a local workspace. I'm interested to see which files were manually merged (ie which ones initially came up in the resolve conflicts window).

Is there any way to find this out now that all conflicts have been resolved?

Upvotes: 0

Views: 43

Answers (1)

Nathan
Nathan

Reputation: 6531

Shelve the merge and undo local changes. Then merge again and record the list of conflicts that cannot be automatically resolved.

This is the slow and painful answer. I sincerely hope there is a better way so I can delete this and not have to sit through a tonne of progress bars.

Upvotes: 1

Related Questions