title: Subversion with Continuous Integration
body: <p>Sorry if answers to this question already exist, I did not find them yet.</p>
  
  <p>I'm member of a web development team, we maintain a web portal. Release Management works with Subversion. This is how I work when adding new features to the portal:</p>
  
  <ul>
  <li>Create a new Branch by copying the Trunk</li>
  <li>Develop in that Branch </li>
  <li>Periodically merge updates from the Trunk into that Branch (I want to know if Framework-Changes break my code, before it goes to UAT / Integration, e.g.)</li>
  <li>Re-Integrate the Branch into the Trunk in order to let it go live</li>
  </ul>
  
  <p>Now we have a problem with Continuous Integration:</p>
  
  <ul>
  <li>Periodical Go-Live every X weeks</li>
  <li>Several Branches exist which are planned to go-live on different dates</li>
  <li>Every X hours a day, Integration Server does a Trunk checkout and merges all Branches (which should explicitly go to Integration System) into it</li>
  <li>The Trunk updates which have been merged into each Branch (see above) now generate Tree Conflicts</li>
  </ul>
  
  <p>What is the Best Practice for that? Re-Integrating doesn't work for merging multiple Branches, because as soon as one Branch is integrates, the working copy isn't clean anymore. However, Continuous Integration must be possible somehow...</p>
  
  <p>If Trank changes are merged into each Branch, different revisions are created. But the files should have the same content and be equal. Isn't there a merge-option saying "ignore a conflict if the two new/changed files are identical"?</p>
  
  <p>Thanks for any help.</p>