title: SVN strategy using branches, and merging changes from trunk into branch
body: <p>So long time user of SVN, but fairly inexperienced in branching / tagging, and when I have I suspect I'm not really using it correctly or to its full potential.</p>
  
  <p>I have my trunk which I work on adding new features etc. This code base is used in multiple websites, where we create a branch off the trunk on a per project basis.</p>
  
  <p>Each branch usually has modifications specific to that project, and anything we think will be re-usable is added to the trunk, and made so that feature can be toggled on and off on the various projects.</p>
  
  <p>Currently when we make changes to the trunk, and want those modifications in a pre-dated branch, I have to go through and manually merge certain revisions into the branch and recommit them. Not ideal, and easy to miss stuff.</p>
  
  <p><strong>So, my question...</strong> is there any way to update my branch with ALL of the changes from the trunk, and deal with them as if it was a standard trunk update with conflicts?</p>
  
  <p>I have seen about reintegrating the branch to the trunk, but due to the way I am using branches in this instance, thats not really something I want to do.</p>