git-workflow

A Git workflow for the Squad project using separate branches for integration, released code, and early-access previews.

In plain words
What is it for?
Use it to name issue branches, start work from dev, create draft pull requests, run tests, and publish preview or released packages.
Why use it?
It provides a consistent path for feature changes and clarifies which branch produces each package version.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/bradygaster/squad/git-workflow
Any agent
npx skills add bradygaster/squad --skill git-workflow
Clone the repo
git clone --depth 1 https://github.com/bradygaster/squad

Made for: Claude Code, Codex.

Per session 16 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,585 The whole file, excluding the scripts and references it only reads on demand.
Security scan C 1 finding. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00016 $0.01585
Opus 5 $0.00008 $0.00792
Sonnet 5 $0.00003 $0.00317
Haiku 4.5 $0.00002 $0.00159

Measured 2d ago against content hash 410f882b5350, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade C, and why

git-workflow scanned grade C with 1 finding against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Recursive force deletehighDestructive command

rm -rf with a variable or a broad path is one typo away from removing the wrong tree.

If a worktree was deleted manually (rm -rf), `git worktree prune` recovers the state.
Origin

Copies of this mod

8 near-identical copies found in the catalogue:

.copilot/skills/git-workflow/SKILL.md · 206 lines

How it starts

The opening of the file, as written. The whole thing — 206 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Context

Squad uses a three-branch model. All feature work starts from dev, not main.

Branch Purpose Publishes
main Released, tagged, in-npm code only npm publish on tag
dev Integration branch — all feature work lands here npm publish --tag preview on merge
insiders Early-access channel — synced from dev npm publish --tag insiders on sync

Branch Naming Convention

Issue branches MUST use: squad/{issue-number}-{kebab-case-slug}

Examples:

  • squad/195-fix-version-stamp-bug
  • squad/42-add-profile-api

Workflow for Issue Work

  1. Branch from dev:

    git checkout dev
    git pull origin dev
    git checkout -b squad/{issue-number}-{slug}
    
  2. Mark issue in-progress:

    gh issue edit {number} --add-label "status:in-progress"
    
  3. Create draft PR targeting dev:

    gh pr create --base dev --title "{description}" --body "Closes #{issue-number}" --draft
    
  4. Do the work. Make changes, write tests, commit with issue reference.

  5. Push and mark ready:

    git push -u origin squad/{issue-number}-{slug}
    gh pr ready
    
  6. After merge to dev:

    git checkout dev
    git pull origin dev
    git branch -d squad/{issue-number}-{slug}
    git push origin --delete squad/{issue-number}-{slug}
    

Parallel Multi-Issue Work (Worktrees)

When the coordinator routes multiple issues simultaneously (e.g., "fix bugs X, Y, and Z"), use git worktree to give each agent an isolated working directory. No filesystem collisions, no branch-switching overhead.

When to Use Worktrees vs Sequential

Scenario Strategy
Single issue Standard workflow above — no worktree needed
2+ simultaneous issues in same repo Worktrees — one per issue
Work spanning multiple repos Separate clones as siblings (see Multi-Repo below)

Setup

From the main clone (must be on dev or any branch):

Read the full file on GitHub · 206 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 2d ago First seen · 206 lines · 16 tokens per session scan C 410f882b5350

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository bradygaster/squad (3,140 stars, last pushed 2d ago), licensed MIT. It adds 16 tokens to every session and 1,585 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it C with 1 finding (recursive force delete). No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.