title: How to merge in TFS when a file has been moved?
body: <p>Here's our situation:
  In TFS 2010 we have the main dev branch and a release branch.
  At some point, it was decided that some code was in a poorly named directory so it was renamed in TFS (only on the main branch as it wasn't a bug fiw).
  I have now fixed a bug in this moved code on the dev branch and want to merge the fix into the release branch.</p>
  
  <p>However, when I do this, rather than performing a merge on the file, it creates a copy of the file in the new location and labels the change as 'merge, branch'.</p>
  
  <p>Am I doing something wrong or is this a 'feature' of TFS?</p>
  
  <p>Update: I've just revisited this post and retried. steps to reproduce the error are:</p>
  
  <ol>
  <li>I have a file (control.cs) in Main/Desktop/UserControls and
  Releases/V5/Desktop/UserControls.</li>
  <li>Using source control explorer I 'Move' UserControls to UserControls2 and check in (I've also tried 'Rename' btw with the
  same results)</li>
  <li>I Edit control.cs on Main and check in.</li>
  <li>I merge Main into Releases/V5 (Note I am merging on the whole branch, not just UserControls)</li>
  <li>I now see the modified control.cs in Releases/V5/Desktop/UserControls2 and the old one in Releases/V5/Desktop/UserControls</li>
  </ol>