never rebase a public branch rebase personal branches to catch up turn on rerere.enabled to remember conflict fixes require linear history, disallow merge commits on GitHub squash and merge prefer trunk based development (https://t.co/wHMyht9RzP) now you know how to git