A quick post in the “How I got burnt” today category. I was attempting a merge from one TFS branch to another, when I start getting the following error
The error is pretty random in that it doesn’t tell what has gone wrong. However, if you look at the Output window, you will find the real reason for this error, which is that the target merge file doesn’t exist. The error happens when you have a TFS workspace but have deleted the files on your local machine. TFS at this point things that you have the latest source and attempts to merge the file. However, since the files are not there, it throws this error. Please note that this error would only happen for files that have merge conflicts.
The fix is quick. Just do a forced get latest of the files involved and this would go away.