Unremovable conflict in TFS

Question

I've got a file-conflict in TFS that I cannot get rid of:

If I click AutoResolve it says:

No conflict has been resolved due to conflicting content changes, name changes or encoding changes. These conflicts will need to be resolved individually

but it doesn't give me any merge-options.

I've tried unmapping and deleting the workspace from disk and re-adding it, but the conflict is still there. Any ideas how to get rid of it?

Edit, the problem seems to be caused by a name change of a file. The file on disk is missing a letter compared to the file in the error message.

Answer 1

I was able to resolve this situation using tf from the command line.

tf resolve <filename> /auto:keepyours

but I think I should have used

tf resolve <filename> /auto:deleteconflict

In any case, keepyours set my local file as the chosen file and removed the conflict from VS.

documentation at: MSDN Resolve Command