TFS Merging keeps merging some files without any changes

Question

For some unknown reason, TFS seems to keep queuing certain files for merges, even though there are no changes. In the Pending Changes windows, the Change column only states Merge, and not the usual Merge, edit or Merge, branch.

Nobody touches these files and yet they keep reappearing under the pending changes merge queue.

I've seen this happen before with a folder that was deleted, but kept reappearing in the merges between branches. In that case, I used tf destroy in all branches for that folder's path and it solved the problem. However, in this environment, it's with files that the team wants to keep.

Has anyone else experienced and/or resolved this issue?

Answer 1

Try TFS 2010 SP1 and CU1. It fixed some merge bugs. Like the following:

Merge or discard in both directions cause unnecessary "empty" merges in future merge attempts.

Answer 2

If you have the Team Foundation Power Tools installed you can use tfpt uu to undo changes to any unchanged files (yes, it's well annoying when files are flagged as changed and you get told they are identical!).