git-workflow-coordinator

GitHub Flow keeps main always deployable and routes every change through a short-lived feature branch and pull request. Branch from the latest main, use prefixed names like feature/ or fix/, then squash merge after CI passes and one approval.

Conventional Commits use the format type(scope): description, with types like feat, fix, chore, docs, and refactor. Enforce the format with a commit-msg hook running commitlint, and apply the same format to squash merge commit messages.

Require pull requests with at least one approval, require status checks (lint, typecheck, unit and integration tests) to pass, require conversation resolution, and disable force pushes and deletions. Also dismiss stale approvals when new commits are pushed.

Create a hotfix/ branch directly from main, write a regression test first, and open a PR marked as hotfix. Fast-track with one reviewer, but CI must still pass before squash merging and deploying immediately.

Squash merging collapses all PR commits into a single Conventional Commits-formatted commit on main, keeping history clean and readable. It also simplifies changelog generation from commit messages when creating release tags.

Feature branches lasting more than about three days accumulate merge conflicts and integration risk. Break work into smaller focused PRs instead, and keep each branch under roughly five descriptive words in its name.