Git Workflow Guide

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 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/cyperx84/claude-code-plugin-examples/git-workflow-guide
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, Codex.

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. 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.00021 $0.02540
Opus 5 $0.00010 $0.01270
Sonnet 5 $0.00004 $0.00508
Haiku 4.5 $0.00002 $0.00254

Measured yesterday against content hash 833d1adb3c29, 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 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 yesterday.

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. yesterday 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 10mo ago), licensed MIT. It adds 21 tokens to every session and 2,540 once invoked, about $0.0001 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-31.

Related

Other skills, from other repositories

article-writing

Write articles, guides, blog posts, tutorials, newsletter issues, and other long-form content in a distinctive voice derived from supplied examples or brand guidance. Use when the user wants polished written content longer than a paragraph, especially when voice consistency, structure, and credibility matter.

affaan-m/ECC · 57 tokens

a-evolve

Apply A-Evolve's agentic evolution methodology to improve AI agent performance across runs. Use when the user wants to diagnose agent failures, generate targeted skills from error patterns, evolve system prompts, or accumulate episodic knowledge. Works standalone or inside AutoResearchClaw pipelines. Triggers on…

aiming-lab/AutoResearchClaw · 100 tokens

hive.chart-creation-foundations

Required reading whenever any chart tool is available. Teaches the one-tool embedding contract (call chartrender → live chart appears in chat AND a downloadable PNG lands in the queen session dir), the ECharts (data viz) vs Mermaid (structural diagrams) decision, the BI/financial-grade aesthetic baseline (no…

aden-hive/hive · 133 tokens

📝 任务完成后归档

重要提醒: 每次完成复杂调试或开发任务后,主动执行此流程! 将学到的经验归档为 skill,供以后参考。不要等用户提醒。.

Project-N-E-K-O/N.E.K.O · 49 tokens

deck-course-module

暖纸背景 + Playfair, 左侧学习目标常驻, 含 MCQ 自测页.

nexu-io/html-anything · 25 tokens

code-documenter

Use when adding docstrings, creating API documentation, or building documentation sites. Invoke for OpenAPI/Swagger specs, JSDoc, doc portals, tutorials, user guides.

zebbern/claude-code-guide · 39 tokens