title: Why is there a conflict after a SVN branch + switch
body: <p>My working copy was pointed at Trunk. I had a big code change that I was not ready to commit to trunk, but I want it under version control, so I decided to Branch (creating the repository copy from my Working Copy, not from Head; and selecting <code>Switch to Branch</code>). At the end of the operation I got the error: <code>One or more files are in a conflicted state.</code> That seems strange; how can my Working Copy be in conflict with a <em>brand new</em> branch created from my Working Copy?</p>
  
  <p><strong>Clues:</strong>
  When I inspect specific tree conflicts I see messages like this: <code>The last switch operation tried to delete/move/rename the file "xxx.cs", but the file was deleted, moved or renamed locally</code> and other similar messages. (Prior to the branch I had moved a number of files into new folders, and renamed some files too). </p>
  
  <p>Can I safely mark the conflicts as resolved and "Keep the local file" (in the case of "files added locally" conflicts) without fear of losing history?</p>