title: TFS/Visual Studio: Move file in the solution without doing an "add-remove"
body: <p>We recently had to do some refactoring, implicating that we had too move some files.</p>
  
  <p>So in one branch, we did all thoses changes. In the trunk, we continued to work normally, but it appears that when merging, it causes a lot of troubles, since the files appears as removed on the old position and added to the new, making the merge very hard.</p>
  
  <p>What is the correct way to proceed when moving file in the solution?</p>