title: SVN resolve tree conflict in merge
body: <p>I have an SVN merge tree conflict that i can't figure out how to resolve and i'm hoping you guys(girls) can help out. </p>
  
  <p>Here's the situation: i created a branch A from trunk to do some development. Then i created a branch B, from branch A. Both branches are evolving concurrently. </p>
  
  <p>At some point i cherry-picked some revisions from branch B into trunk to get some features developed in branch B.</p>
  
  <p>Now, i synced branch A with trunk:</p>
  
  <pre><code>~/branch_a$ svn merge ^/trunk
  ~/branch_a$ svn commit
  </code></pre>
  
  <p>No problems here. Next step is to sync B with A:</p>
  
  <pre><code>~/branch_b$ svn merge ^/trunk
  </code></pre>
  
  <p>Here i get some tree conflicts, in files/dirs that already existed in trunk before the merge but were changed in the cherry-picks i did earlier (don't know if it has anything to do with it, i'm just mentioning it):</p>
  
  <pre><code>  C some_dir/other_dir/some_file.php
    &gt;   local add, incoming add upon merge
    C some_other_dir/some_sub_dir
    &gt;   local add, incoming add upon merge
  </code></pre>
  
  <p>Essentially i want the versions of the files that are coming in from the merge and discard the current version. What's the best way to solve this?</p>
  
  <p>Thanks in advance!</p>