title: SVN Merge new line from trunk to branch conflict
body: <p>Whilst merging revisions from the trunk to a branch I am looking to achieve the following:</p>
  
  <p>Revision 1 (This is also the branch version):</p>
  
  <pre><code>First Line
  </code></pre>
  
  <p>Revision 2:</p>
  
  <pre><code>First Line
  Second Line
  </code></pre>
  
  <p>Revision 3:</p>
  
  <pre><code>First Line
  Second Line
  Third Line
  </code></pre>
  
  <p>By executing the following command on the branch:</p>
  
  <pre><code>svn merge -c 3 [trunkurl]
  </code></pre>
  
  <p>I am expecting to get the following result</p>
  
  <pre><code>First Line
  Third Line
  </code></pre>
  
  <p>But instead I am getting a tree conflict.
  This technique seems to work fine for adding new lines in the middle of files, just not to the end of a file.</p>