title: How to correctly delete a folder that is part of TFS project's branch?
body: <p>Using VS 2015 and TFS 2013.
  Needed to delete and recreate the Dev branch. I deleted it from Source Control Explorer in VS, checked in pending changes and the branch disappeared.</p>
  
  <p>But the branch folder was still there in the workspace (local disk).</p>
  
  <p>I deleted that from disk assuming since TFS deleted it from source control and I don't need it, it should be safe to delete.</p>
  
  <p>Now when I recreated the Dev branch as child of Main branch, and try to merge Main to Dev, I get conflicts for every single file and folder in Main, saying item was removed from target branch. Why is TFS complaining? Why is there no way to resolve this with one click instead of individually clicking "use source version" button? Or, what am I doing wrong? :)</p>