My way of working with Git Do you need a local master branch? https://medium.com/@AlecBenzer/dont-checkout-master-locally-f5eabe1a98f0 I hate squash merges Git powerups Mergiraf A syntax-aware git merge driver for a growing collection of programming languages and file formats.