git-workflow

A guide for Git collaboration tasks such as branches, pull or merge requests, and conflict resolution. A branch is a separate line of work, while a pull or merge request proposes combining it with another branch.

In plain words
What is it for?
Use it for branch planning, preparing or reviewing pull/merge requests, checking contributors, and resolving conflicting changes.
Why use it?
It provides a repeatable way to inspect repository history, choose a branching approach, resolve conflicts, and report the correct review link.

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/aretw0/agents-lab/git-workflow
Any agent
npx skills add aretw0/agents-lab --skill git-workflow
Clone the repo
git clone --depth 1 https://github.com/aretw0/agents-lab

Made for: Claude Code, Codex.

Per session 40 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 646 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. 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.00040 $0.00646
Opus 5 $0.00020 $0.00323
Sonnet 5 $0.00008 $0.00129
Haiku 4.5 $0.00004 $0.00065

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

Security

Grade A, and why

git-workflow scanned grade A with 0 findings 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.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

packages/git-skills/skills/git-workflow/SKILL.md · 94 lines

How it starts

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

Git Workflow

Help with Git operations and workflow strategy.

Branch Strategy

# Inspect current state
git branch -a
git log --oneline -20
git status

Recommend strategy based on project context:

  • Solo: main + short-lived feature branches
  • Team: main + develop + feature/* / fix/* branches
  • Release cadence: GitFlow (main / develop / release/* / hotfix/*)

PR / MR Workflow

  1. git diff main --stat — review what changed
  2. Draft a clear title and description
  3. Suggest reviewers based on touched files: git log --format='%an' -- <files>
  4. Always include the full PR/MR URL in any summary or status update:
    PR: https://github.com/owner/repo/pull/42
    
    Retrieve with: gh pr view --json url --jq .url (GitHub) or glab mr view --output json | jq .web_url (GitLab)

Conflict Resolution

  1. git diff --name-only --diff-filter=U — find conflicted files
  2. Read each conflicted file
  3. Understand both sides of the conflict
  4. Resolve with minimal changes, preserving intent from both sides

Interactive Rebase

Guide through git rebase -i for cleaning history before a PR.

If resolving conflicts during rebase, continue non-interactively:

GIT_EDITOR=true git rebase --continue

Non-Interactive Safety

When the agent runs git or gh/glab, never open an interactive editor or prompt.

Commits — always pass message on the command line:

git commit -m "fix(scope): message"

Rebase continue--no-edit is not supported, use:

GIT_EDITOR=true git rebase --continue
# or
git -c core.editor=true rebase --continue

Merge — reuse existing message:

git merge --no-edit

Any other git command that could open an editor:

GIT_EDITOR=true git <command>

GitHub CLI — disable prompts and provide all fields explicitly:

GH_PROMPT_DISABLED=1 gh pr create --title "..." --body "..."
GH_PROMPT_DISABLED=1 gh pr merge --squash --delete-branch

Read the full file on GitHub · 94 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 · 94 lines · 40 tokens per session scan A 5128e35f6ddd

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository aretw0/agents-lab (11 stars, last pushed 2mo ago), licensed MIT. It adds 40 tokens to every session and 646 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.