Reputation: 7799
I've got a file in Visual Studio TFS that was deleted my one of my teammates while I was doing a merge. When I try to check in the merged/deleted file, I get a dialog that it was checked in because there were conflicts. The Pending Changes - Conflicts tap doesn't show any conflicts but the Output windows has the following message:
"The item $/.../Reference.cs does not exist at the specified version."
When I try to undo the changes, I get an error that says "Sql Error: 515"
So I can't check in the file and I can't undo the changes.
I'd be OK with remvoing the file altogether or adding back to source control. I just want it out of my pending changes list.
Upvotes: 5
Views: 6575
Reputation: 88064
Interesting situation.
The quick fix might be to just undelete the file within TFS.
Upvotes: 5