title: How to avoid tree conflicts when merging branches that were moved?
body: <p>I have a repository that looks like this:</p>
  
  <pre><code>/a/trunk/Library
  /a/branches/FeatureX/Library
  /b/trunk/Application
  /b/branches/FeatureX/Application
  </code></pre>
  
  <p>I want to rearrange this so that I have the Application and Library folders next to each other:</p>
  
  <pre><code>/a/trunk/Library
  /a/trunk/Application
  /a/branches/FeatureX/Library
  /a/branches/FeatureX/Application
  </code></pre>
  
  <p>I tried to achieve this by simply "svn copy"-ing the "Application" folders. The problem I'm facing is that when I try to merge "FeatureX" into "trunk" later on, I get a tree conflict because "Application" was added in both trunk and the branch.</p>
  
  <p>Is there a better way to do this?</p>
  
  <p>(BTW i cannot merge "FeatureX" <em>before</em> copying "Application", this is just a test to see if it will be possible later on...)</p>