SourceTree Rebasing - npazo/massive-dangerzone GitHub Wiki

  1. Check out master branch.
  2. Get latest (pull) from master branch
  3. Check out feature branch
  4. Get latest (pull) from feature branch
  5. "Rebase current changes onto master"
  6. Fix conflicts + squash commits
  7. Check in feature branch
  8. Pull request