Git Workflow Guide

Git Workflow Guide is a skill for Claude Code from cyperx84/claude-code-plugin-examples. It costs 21 tokens per session (2,540 once invoked), scanned A, original, MIT.

A guide to Git collaboration practices, including branches, merge and rebase choices, conflict resolution, and team workflows.

In plain words
What is it for?
Use it to set up a project’s Git process, decide how to combine changes, resolve conflicts, or teach team members how the workflow operates.
Why use it?
It helps choose a way to manage changes that fits the team size, release rhythm, and style of collaboration.

Skill for Claude Code

Written for Claude Code: shipped in a Claude Code plugin.

Part of the git-helper-plugin plugin — 2 skills shipped together

Good fit Use it to set up a project’s Git process, decide how to combine changes, resolve conflicts, or teach team members how the workflow operates.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/cyperx84/claude-code-plugin-examples/git-workflow-guide
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.

Any agent
npx skills add cyperx84/claude-code-plugin-examples --skill git-workflow-guide
Clone the repo
git clone --depth 1 https://github.com/cyperx84/claude-code-plugin-examples

Made for: Claude Code.

Or install git-helper-plugin, the plugin that ships this one along with the rest of its 2 skills.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for Git Workflow Guide

README.md
[![agentmods](https://agentmods.dev/badge/skills/cyperx84/claude-code-plugin-examples/git-workflow-guide/github.svg)](https://agentmods.dev/skills/cyperx84/claude-code-plugin-examples/git-workflow-guide)
Your own site
<a href="https://agentmods.dev/skills/cyperx84/claude-code-plugin-examples/git-workflow-guide"><img src="https://agentmods.dev/badge/skills/cyperx84/claude-code-plugin-examples/git-workflow-guide/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for Git Workflow Guide

Your own site · 80×15
<a href="https://agentmods.dev/skills/cyperx84/claude-code-plugin-examples/git-workflow-guide"><img src="https://agentmods.dev/badge/skills/cyperx84/claude-code-plugin-examples/git-workflow-guide.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 21 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 2,540 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
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.1 $0.00021 $0.02540
Opus 5.5 $0.00008 $0.01016
Sonnet 5.5 $0.00004 $0.00508
Haiku 4.5 $0.00002 $0.00254

Measured 2mo ago against content hash 833d1adb3c29, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

Git Workflow Guide 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 2mo 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.

examples/01-beginner/git-helper-plugin/skills/git-workflow-guide/SKILL.md · 487 lines

How it starts

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

Git Workflow Guide

Purpose

Provide comprehensive guidance on:

  • Git branching strategies
  • Collaboration workflows
  • Merge vs rebase decisions
  • Conflict resolution
  • Git best practices

When to Use

Invoke this skill when:

  • Setting up a new project's git workflow
  • User asks about branching strategy
  • Resolving merge conflicts
  • Deciding between merge, rebase, or squash
  • Onboarding team members to git practices
  • Troubleshooting git issues

Instructions

Step 1: Understand the Context

Determine:

  1. Team size: Solo, small team (2-5), medium (6-20), large (20+)
  2. Release cadence: Continuous, weekly, monthly, versioned
  3. Collaboration style: Individual, pair programming, code review
  4. Project maturity: New, active development, maintenance mode

Step 2: Recommend Workflow

Choose appropriate workflow based on context:

For Solo Developers
  • Simple trunk-based: Main branch + feature branches
  • Minimal overhead
  • Quick iterations
For Small Teams (2-5)
  • GitHub Flow: Main + feature branches
  • Pull requests for review
  • Deploy from main
For Medium Teams (6-20)
  • Git Flow: Main, develop, feature, release, hotfix branches
  • Structured release process
  • Clear separation of concerns
For Large Teams/Complex Projects
  • Trunk-Based Development: Short-lived feature branches
  • Feature flags for incomplete features
  • Continuous integration focus

Step 3: Provide Specific Guidance

Based on the user's question, provide detailed guidance on:

  • Branch naming conventions
  • Commit strategies
  • Merge/rebase best practices
  • Code review process
  • Release management

Branching Strategies

GitHub Flow (Recommended for Most)

Branches:

  • main: Always deployable, production code
  • feature/*: Short-lived feature branches

Workflow:

# 1. Create feature branch from main
git checkout main
git pull origin main
git checkout -b feature/user-authentication

# 2. Make changes and commit
git add .
git commit -m "feat(auth): add login functionality"

# 3. Push and create pull request
git push -u origin feature/user-authentication

# 4. After review, merge to main
# (Usually done via PR interface)

# 5. Delete feature branch
git branch -d feature/user-authentication

Read the full file on GitHub · 487 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. 2mo ago First seen · 487 lines · 21 tokens per session scan A 833d1adb3c29

Subscribe to this mod's changes

Git Workflow Guide is a skill published in the GitHub repository cyperx84/claude-code-plugin-examples (2 stars, last pushed 1y ago), licensed MIT. It adds 21 tokens to every session and 2,540 once invoked, about $0.0001 per session on Opus 5.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-31.