A set of practical guidelines for reducing friction in team-based version control workflows. Key recommendations include avoiding long-lived forks and merging frequently to minimize merge complexity, conducting code review informally before development starts rather than after, offering help instead of blame when builds break, preferring forward fixes over reverts, and overcoming fear of committing imperfect code by recognizing that partial solutions have value and all mistakes can be undone.
Table of contents
Don’t forkDo code review informally, before development beginsOffer help, not repudiation, when the build is brokenTry hard to roll forwardsNothing is too serious to roll backContact/etcSort: