Rebasing For feature/topic branches, you should always use the --rebase flag to git pull, or if you are usually handling many temporary "to be in a github pull request" branches, run the following to automate this: git config branch.autosetuprebase local

in order to track the always-improving upstream project, we continuously rebase our patches on top of the upstream master

We don’t use merge commits.