SourceTree Rebasing - npazo/massive-dangerzone GitHub Wiki
- Check out master branch.
- Get latest (pull) from master branch
- Check out feature branch
- Get latest (pull) from feature branch
- "Rebase current changes onto master"
- Fix conflicts + squash commits
- Check in feature branch
- Pull request