title: SVN merge from trunk to branch results in tree conflicts
body: <p>Assuming we have one <code>trunk</code> and one branch (<code>COKE</code>). (I run Git over SVN and merge from <code>trunk</code> to <code>COKE</code> with svn, not Git)</p>
  
  <ol>
  <li>There have been changes in <code>FILE1 on trunk</code> that we want in <code>COKE</code> branch.</li>
  <li>We merge from <code>trunk</code> and I commits the merge on <code>COKE branch</code>.</li>
  <li>Then <code>FILE1</code> is deleted from <code>trunk</code>, I want that change in <code>COKE</code>.</li>
  <li>I merge and a tree conflict occurs on <code>FILE1</code> on <code>COKE branch</code>.</li>
  </ol>
  
  <p><strong>Does this tree conflict occurs because of the commit with merge in (2)?</strong></p>
  
  <p><strong>What could I do to fix this three conflicts?</strong> </p>
  
  <p><code>svn resolve --accept theirs-full /path/FILE1</code> doesn't work, says only "working" is going to work.</p>