title: Problem in SVN merging branches into trunk
body: <p>I have a trunk (A) and two branches (B and C). When I merge A with C its OK, after I merge A with B, the previous C its overwriten and my trunk don't have the C changes.</p>
  
  <p>What I want is A + B + C into trunk after merges.</p>
  
  <p>Edited for more explanation:</p>
  
  <ol>
  <li>In trunk I have 3 files: "FILE 1", "FILE 2" and "FILE 3";</li>
  <li>I create a branch from trunk as "Branch 1";</li>
  <li>I switch to "Branch 1", I fix bugs into "FILE 1" file and commit;</li>
  <li>In the same time, another person create a branch from trunk as "Branch 2";</li>
  <li>This person fix another bugs into "FILE 2" and "FILE 3" files and commit;</li>
  <li>The "Branch 2" is approved for publish, then I merge "Branch 2" to "trunk" (its ok);</li>
  <li>In next day the "Branch 1" is approved, then I merge "Branch 1" to "trunk", and the "trunk" lose the changes from "Branch 2".</li>
  </ol>