git-workflow

A practical guide to using Git for branches, commit messages, conflict resolution, rebasing, merging, and release tags.

In plain words
What is it for?
Use it when starting features or fixes, writing commits, resolving conflicts, cleaning branch history, or preparing a release.
Why use it?
It gives a consistent way to organize changes and clean up collaboration problems without adding unnecessary process.

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

Made for: Claude Code, Codex.

Per session 41 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,089 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.00041 $0.01089
Opus 5 $0.00020 $0.00544
Sonnet 5 $0.00008 $0.00218
Haiku 4.5 $0.00004 $0.00109

Measured 2d ago against content hash 4a53add2e1ee, 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.

skills/git-workflow/SKILL.md · 135 lines

How it starts

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

Git Workflow

Opinionated, practical Git patterns for teams that ship. Skip the theory — here's what to actually do.

When to Use

  • Starting a new feature or fix
  • Writing a commit message
  • Resolving a merge conflict
  • Preparing a release
  • Cleaning up a messy branch history

Branching Strategy

Use GitHub Flow for most teams (continuous delivery):

main  ← always deployable, protected
  ├── feat/add-rag-pipeline
  ├── fix/null-session-middleware
  └── chore/bump-langchain-deps

Branch naming: feat/ fix/ chore/ refactor/ docs/ + short-kebab-description.

When to use GitFlow instead: only if you ship versioned releases (mobile apps, SDKs, libraries) with defined release cycles. For web services and APIs, GitFlow adds process with no benefit.

Commit Messages

Format: type: imperative verb + what changed

feat: add streaming support to chat completions
fix: handle null user in session middleware
refactor: replace O(n²) dedup with hash set
chore: bump langchain from 0.2.1 to 0.3.0
docs: add RAG evaluation guide to README
test: add edge cases for empty query handling

Rules:

  • Imperative mood: "add", "fix", "remove" — not "added", "fixing", "removes"
  • Under 72 characters for the subject line
  • If you need to explain WHY, add a blank line then a paragraph body
  • Never: "WIP", "fix stuff", "update", "changes"

When to add a body:

fix: prevent session token from expiring mid-request

The token refresh was happening after the auth check instead of before,
causing a race condition when tokens expired between 0-500ms of the check.
Moved refresh to happen before any auth validation.

Rebase vs Merge

Use rebase for feature branches before merging to main:

git fetch origin
git rebase origin/main    # replay your commits on top of latest main
git push --force-with-lease  # safe force push (fails if someone else pushed)

Use merge only for: merging main into a long-running branch, or when you want to preserve the exact history of a collaborative branch.

Read the full file on GitHub · 135 lines

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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 · 135 lines · 41 tokens per session scan A 4a53add2e1ee

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository chandrudp29/skillhub (13 stars, last pushed 2mo ago), licensed MIT. It adds 41 tokens to every session and 1,089 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.

Related

Other skills, from other repositories

git-flow

Git Workflow & Branching Strategy: Helps define and follow Git branching strategies (Git Flow, GitHub Flow, Trunk-Based), write good commit messages, manage releases, and resolve merge conflicts. Use whenever the user asks about Git workflow, branching strategy, commit conventions, release management, merge conflicts…

camilooscargbaptista/cto-toolkit · 115 tokens

git-workflow

Git operations: commits, branches, PRs, and conflict resolution.

vstorm-co/pydantic-deepagents · 17 tokens

git-flow-pr

Executes the full PR-driven development workflow: create an isolated feature branch from the current work, commit all staged changes, rebase cleanly onto the selected base branch (skipping any ancestor commits already merged), push the branch, and open a GitHub pull request linked to a related issue. Includes guidance…

soulcodex/agentic · 103 tokens

git-workflow-and-versioning

Git workflow and version control best practices. Use when committing code, creating branches, preparing pull requests, or managing release versioning. Use when structuring commit messages or planning a branching strategy.

vanja-emichi/a0_agent_skills · 45 tokens

npm-publish

Use when publishing Node/npm packages from a repository or monorepo, especially scoped public packages, beta/latest dist-tags, workspace publishing, npm 2FA, publish verification, local tarball smoke tests, and debugging npm publish/install errors such as E403, E404, ENOVERSIONS, ELOOP, or pack destination failures.

dirtybits/agent-skills · 73 tokens

dw-unslop

Cut the AI tells out of text a human will read — a PR body, a commit body, a release note — without flattening it into something voiceless. Refuses agent-facing artifacts by name. Explicit-invoke only.

dominikwozniak/dw-solo-skills · 51 tokens