Idiot Proof Git
Big fan of Git style guides in teams. We had one at Thread. It was common for engineers to come in and find we didn&#x27;t do rebasing and find it weird, but we took the opinion that history should be exactly what you actually did, not some clean and idealised version of what you wish you had done. There are advantages and disadvantages to this, but having a defined approach was the most important aspect.<p>Also the fact that we didn&#x27;t rebase and used merges everywhere was a major contributor to no one ever breaking their git repos, something that git seems notorious for elsewhere.