dev-git-workflow
Installation
SKILL.md
Git Workflow
Use this skill to choose a team Git model, set merge and review policy, and define safe defaults for human and AI-assisted collaboration. It assumes the reader knows Git commands; it carries the decisions.
Default bias: GitHub Flow or trunk-based development, one merge method per repository, a merge queue once PRs routinely go stale before landing, one worktree per agent, and release branches only when version support requires them. Hosting-platform features (stacked PRs, merge-queue options, ruleset fields) and Git itself change several times a year: before recommending a version-gated Git feature, check the release notes on git-scm.com; before recommending a platform feature, check that platform's docs for availability on the user's plan.
Quick Reference
| Need | Default | Reference |
|---|---|---|
| Pick a branching model | GitHub Flow; trunk-based plus merge queue at high merge concurrency | references/branching-strategies.md |
| Pick a merge method | squash for small-PR flows; merge commits for release branches | Merge Method, references/pr-best-practices.md |
| Keep main green under concurrency | merge queue or merge train | Merge Queue, references/automated-quality-gates.md |
| Land dependent changes fast | stacked PRs | references/stacked-diffs-guide.md |
| Run parallel agent or feature work | one worktree and branch per agent | references/ai-agent-worktrees.md |
| Release and hotfix | upstream-first fixes, tags from main | references/release-management.md |
| Commit messages and changelogs | owned by dev-git-commit-message | dev-git-commit-message, references/commit-conventions.md |
| Debug bad merges or regressions | conflict discipline, bisect | references/conflict-resolution.md, references/git-bisect-debugging.md |