0

I just had Visual Studio fail on a commit due to a merge conflict and when I was done I had about 10 files that it thought were checked in that in reality never made it to TFS.

I ended up having to compare every file I might have changed and adding a single space to the ones I did... quite tedious. I'm wondering if anyone knows of a way to tell which files have been changed in this situation?

1 Answers1

0

Visual Studio will recheck all files when you change from offline mode to online.

If you don't mind losing the changes, you can also just re-checkout everything with the option to overwrite files enabled.

Nick Whaley
  • 2,729
  • 2
  • 21
  • 28