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?