title: What's the difference between "svn merge --reintegrate" and svn merge without reintegrate if I'd like to merge a branch onto the trunk
body: <p>In the <a href="http://svnbook.red-bean.com/en/1.7/svn.ref.svn.html#svn.ref.svn.sw.reintegrate" rel="noreferrer">svn book</a> it says <code>merge</code>'s <code>--reintegrate</code> is "to merge all of the source URL's changes into the working copy".  </p>
  
  <p>I would like to merge a branch back to the trunk. <a href="https://stackoverflow.com/a/7071338/733034">Some places</a> say that it's "absolutely necessary" to call <code>reintegrate</code> when merging and then <a href="https://stackoverflow.com/questions/3816626/deleting-an-svn-branch">delete the branch</a> immediately afterwards, which I think is a hassle. <a href="http://www.mediawiki.org/wiki/Quick_SVN_merging_guide" rel="noreferrer">Other places</a> do not mention reintegration at all. I have svn 1.6.11.</p>
  
  <p>So I'm not sure what to do now.</p>