title: SVN how to resolve new tree conflicts when file is added on two branches
body: <p>When merging a couple of branches (using SVN 1.6.1) where a file has been added on both branches (and then worked on in those separate branches) I'm getting one of the new tree conflicts:</p>
  
  <pre><code>      C foo.txt
    &gt;   local obstruction, incoming add upon merge
  </code></pre>
  
  <p>I need the changes from both branches, but the tree conflict doesn't give me the usual .working, .merge-left &amp; .merge-right files -- which is understandable due to the nature of the conflict. There are quite a few of these conflict, and ones where a delete of the same file has occurred on each branch, but they're simple to resolve.</p>
  
  <p>How can I resolve this issue? The SVN redbean book (for 1.6) doesn't cover this situation.</p>