title: Git Rebase or SVN Reintegrate for Feature Branches?
body: <p>We are currently using SVN, but considering moving to Git to support our new workflow, which relies heavily on rebase.</p>
  
  <p>We're considering a development workflow where each individual feature is developed on a separate branch, then merged into trunk/master when it's ready for release. The branch will always be deleted after it is merged back into trunk/master.</p>
  
  <p>One proposal is to use git rebase to keep the feature branch up-to date with changes in master (so we can test in the branch exactly what will be released), and to simplify the merge from branch -> master.</p>
  
  <p>The alternative we're considering is to use svn merge to keep the feature branch up-to-date with changes in trunk, then using svn merge --reintegrate to merge the feature branch back into trunk for release.</p>
  
  <p>What are the differences and potential pitfalls of each of these approaches? And which is more appropriate for our workflow?</p>