title: Tortoise SVN - Merge Trunk into Branch - Tree Conflict
body: <p>We are on SVN 1.8 and I'm using Tortoise SVN 1.8 as well.  </p>
  
  <p>The main code resides on /project/trunk.  I will be doing a large change so I created a branch in <code>/project/branches/x</code> that was a copy of <code>/project/trunk</code>.</p>
  
  <p>As part of the change, I need to rearrange the directory structure to handle multiple clients.  Currently the the trunk looks like:</p>
  
  <pre><code>/project/trunk/process/xyz/file1.xml
  /project/trunk/process/xyz/file2.xml
  </code></pre>
  
  <p>I want to change the structure to be more like:</p>
  
  <pre><code>/project/trunk/process/xyz/client1/file1.xml
  /project/trunk/process/xyz/client1/file2.xml
  </code></pre>
  
  <p>I tried right-dragging into the new folder and did a SVN Move Here with the context menu.  As I'm working on in the branch, I need to make a change to file1.xml in the trunk for a production issue.  I want that change in my branch, but when I tried to do a merge in Tortoise SVN, it comes up with a conflict because the local file is missing.  </p>
  
  <p>The options simply give me options to resolve, postpone or abort.  What is the best way to get the change from <code>/trunk/process/xyz/file1.xml</code> into <code>/trunk/process/xyz/client1/file1.xml</code>?</p>
  
  <p>I'm kind of a novice in SVN so please be kind :)</p>