title: TFPT Unshelve migrate not working
body: <p>I know this has been asked before, but as there were no answers, I'm asking again. </p>
  
  <p>I'm trying to migrate a shelveset from one branch to another. I'm running the following command, from within the workspace DIR:</p>
  
  <pre><code>tfpt unshelve changes;myusername /migrate /source:$/main /target:$/new-branch
  </code></pre>
  
  <p>when i run that command I get the 'shelveset details' window up, with the changes, and the folder (pointing to $/Main)</p>
  
  <p>Clicking unshelve gives me the conflicts dialog box, again with folder pointing to $/main. If I click resolve, i get the following options:</p>
  
  <ul>
  <li>Keep my local changes Undo my local changes, and take the shelved</li>
  <li>Undo my local changes, and take the shelved changes.</li>
  <li>Keep my local changes, and merge the local and shelved contents</li>
  </ul>
  
  <p>which ever option I pick, I never get any pending changes in 'new-branch'. The only changes I have pending are for the main branch. </p>
  
  <p>any ideas? </p>