Skip to content

Git workflow

Branches

BranchPurposeWho merges
mainProduction code, always deployableReviewer after PR approval
feat/<name>New featuresYou create, reviewer merges
fix/<name>Bug fixesYou create, reviewer merges
chore/<name>Maintenance, deps, docsYou create, reviewer merges
hotfix/<name>Critical production fixesYou create, reviewer merges

Workflow

  1. Pull the latest main
  2. Create your branch from main
  3. Make small, focused commits using semantic commit format
  4. Push your branch
  5. Open a PR, request review
  6. Address feedback
  7. Reviewer squash-merges into main

Rules

  • Never push directly to main
  • Never merge your own PRs
  • All commits must be signed (SSH)
  • Keep PRs small and focused - one concern per PR
  • Rebase on main if your branch falls behind