title: TFS Merging keeps merging some files without any changes
body: <p>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 <strong>Change</strong> column only states <strong>Merge</strong>, and not the usual <strong>Merge, edit</strong> or <strong>Merge, branch</strong>.</p>
  
  <p>Nobody touches these files and yet they keep reappearing under the pending changes merge queue.</p>
  
  <p>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 <strong>tf destroy</strong> 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. </p>
  
  <p>Has anyone else experienced and/or resolved this issue?</p>