title: Merging changes between svn branches
body: <h1>Background</h1>
  <p>Our server is running subversion 1.8.10. Our clients use 1.8+. We mostly use TortoiseSVN (so I will describe using tortoise terms), version 1.8+.<br />
  Our (common) subversion workflow is:</p>
  <ul>
  <li>Branch/Tag from trunk (and switch to it).</li>
  <li>Update/Commit work periodically over time.</li>
  <li>Merge Range of Revisions (MRoR) from trunk to branch as need be.</li>
  <li>Compare URLs, between trunk and branch, to diff and do code review.</li>
  <li>Merge Two Different Trees (MTDT), from trunk to branch, in order to merge back to trunk.</li>
  <li>Branch cleanup.</li>
  <li>Move on (repeat).</li>
  </ul>
  <p>This all works perfectly fine.</p>
  <h1>The problem</h1>
  <p>We have run into situations in which, say, BranchA has some changes (e.g. adds some files). It is up to date (from trunk) and going through code review before it gets merged back into the trunk. BranchB is created (from trunk) and would like to get the changes from BranchA in order to build forth from them.<br />
  If we MRoR from BranchA to BranchB, we get the changes as we would expect. We can merge BranchA as many times as we like, we can also MRoR from trunk into BranchA or BranchB.. all seems fine.<br />
  BranchA can be merged back into trunk (using MTDT), works fine. However, once we MRoR trunk into BranchB again, after BranchA's merge, we get tree conficts. Why is this? SVN is tracking the merge history, it can see BranchA is who created/moved/etc files. If I do the same process, but instead use MTDT to merge from BranchA to BranchB, the outcome is the exact same. This still happens even if BranchB has no changes of its own.</p>
  <p>What is the proper way to merge from BranchA into BranchB such that no tree conflicts arise, upon next MRoR from trunk to BranchB, after BranchA has been merged back into trunk?</p>
  <p>This sort of thing is easily done in git. I'm sure that there should be a way to get around the tree conflicts.</p>
  <p>Thanks for any help!</p>