Overview
Most "Git workflow" articles describe systems built for hundreds of contributors and then prescribe them for teams of three. The opposite mistake — no convention at all — falls apart the moment two people touch the same file.
Highlights
- Trunk-based development with short-lived branches is the right default for most teams
- Use conventional commits only if you actually consume them — otherwise they are just noise
- Squash-merge for feature branches, fast-forward for hotfixes, never rewrite shared history
Comments