Ctrl-Alt-Undelete

Team Foundation Server was being particularly ornery today and barfed up this error during a merge:

Cannot undelete … because not all of the deletion is being undeleted.

Gee, thanks for that informative error message, Microsoft. Sure made my day easier.

Oh, and in case you’re wondering what the solution is, here’s what you do: Find someone who knows TFS better than you and get them to fix it.