title: Reintegrating from branch to trunk, then merge back into branch in SVN .. what happens?
body: <p>What's the appropriate way to do the following - </p>
  
  <ol>
  <li>There's trunk. I create a branch</li>
  <li>I work on branch. Make changes. </li>
  <li>Meanwhile trunk has changed, so I keep doing <code>cd branch; svn merge $SVNTRUNK</code> in my branch every once a while.</li>
  <li>Finally, I do <code>cd trunk; svn merge --reintegrate $SVNBRANCH</code>. All this I just do following the SVN book.</li>
  </ol>
  
  <p>What's the right way to do something on my branch now? Should I just delete my branch, and create a new branch from the trunk? If I do a <code>cd trunk; svn merge $SVNTRUNK</code> I get a whole bunch of "local add, incoming add upon merge" messages ... </p>
  
  <p>What are those? How do I resolve this? </p>
  
  <p>I assumed SVN would cleanly realize that all those files listed as "local add, incoming add upon merge" are the same as the ones I already have in my branch .. but apparently not. </p>