dev-git-workflow
Installation
SKILL.md
Git Workflow
Use this skill to choose a team Git model, define PR discipline, standardize commit and release rules, and set safe defaults for human and AI-assisted collaboration.
Bias toward modern delivery: GitHub Flow or trunk-based development for most teams, merge queues for busy repositories, worktrees for agent isolation, and release branches only when version support actually requires them. Git 2.55 (June 2026) is the current stable release; verify latest at git-scm.com. GitHub native stacked PRs (gh stack) remain private-preview and waitlist-gated as of this writing (entered preview April 2026, no GA date announced) — verify current status before recommending it as a default over Graphite, ghstack, or manual stacking.
Quick Reference
| Need | Default | Reference |
|---|---|---|
| Pick a branching model | GitHub Flow for most teams; trunk-based for high-concurrency teams | references/branching-strategies.md |
| Run parallel agent or feature work safely | one worktree per branch or agent | references/ai-agent-worktrees.md |
| Implement repo-local agent delivery | standardize start / gate / pr / finish plus worktree-safe scripts |
this skill, references/ai-agent-worktrees.md |
| Keep PRs reviewable | small focused PRs or stacked diffs | references/pr-best-practices.md, references/stacked-diffs-guide.md |
| Standardize commits and releases | Conventional Commits plus automated release tooling | references/commit-conventions.md, references/release-management.md |
| Keep merge safety high | required checks, approvals, rulesets, merge queue | references/automated-quality-gates.md |
| Debug bad merges or regressions | conflict discipline, rebase hygiene, bisect | references/conflict-resolution.md, references/git-bisect-debugging.md |