title: svn: merging between branches other than trunk
body: <p>We have a SVN project with branch B that I work on, and branch C, that a coworker works on. (he works primarily on one area of code and I work primarily on another)</p>
  
  <p>How are he and I supposed to merge, if we wish to stay in sync prior to doing any merges to the trunk?</p>
  
  <p>We don't have any problems merging content, but the content (particularly svn:mergeinfo, for obvious reasons) keeps displaying tree conflicts and always gives us trouble.</p>
  
  <p>What should we do?</p>