Dev.to
7/21/2026
A Git Workflow for Small Teams
Short summary
A practical Git workflow for small teams (2-3 people) building SaaS products, combining trunk-based development with useful elements of GitFlow. Features short-lived feature branches off main, standardized branch naming (type/description format), and Conventional Commits for automated changelog generation. The approach scales down to solo founders and up reasonably far before needing changes.
- •Trunk-based development with short-lived feature branches is ideal for small SaaS teams
- •Standardized branch naming (feat/fix/chore/refactor) maps to Conventional Commits for tooling
- •Short-lived branches (1-2 days) minimize drift and keep merges reviewable
Generated with AI, which can make mistakes.
Is this a good recommendation for you?



