git-workflow-and-versioning

git-workflow-and-versioning is a skill for Claude Code, Codex from douglance/sdlc-plugin. It costs 26 tokens per session (1,875 once invoked), scanned A, original, MIT.

A guide to managing code changes with Git, a tool for tracking versions and collaborating on software. It covers short-lived branches, commits, releases, and merging work.

In plain words
What is it for?
Use it when creating commits or branches, resolving conflicts, planning releases, or integrating parallel development.
Why use it?
It helps teams reduce branch drift, merge conflicts, and delays when several workstreams change the same project.

Skill for Claude CodeCodex

Part of the sdlc plugin — 30 skills, 1 plugin shipped together

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

Made for: Claude Code, Codex.

Or install sdlc, the plugin that ships this one along with the rest of its 30 skills, 1 plugin.

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-and-versioning

README.md
[![agentmods](https://agentmods.dev/badge/skills/douglance/sdlc-plugin/git-workflow-and-versioning.svg)](https://agentmods.dev/skills/douglance/sdlc-plugin/git-workflow-and-versioning)
Your own site
<a href="https://agentmods.dev/skills/douglance/sdlc-plugin/git-workflow-and-versioning"><img src="https://agentmods.dev/badge/skills/douglance/sdlc-plugin/git-workflow-and-versioning.svg" alt="Measured on agentmods" height="20"></a>
Per session 26 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,875 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.00026 $0.01875
Opus 5 $0.00013 $0.00937
Sonnet 5 $0.00005 $0.00375
Haiku 4.5 $0.00003 $0.00187

Measured 3d ago against content hash c9d62ca343b9, 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-and-versioning 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 3d 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.

.agents/skills/git-workflow-and-versioning/SKILL.md · 236 lines

How it starts

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

Git Workflow and Versioning

When to Use

Always. Every code change flows through git.

Core Principles

Trunk-Based Development (Recommended)

Keep main always deployable. Work in short-lived feature branches that merge back within 1-3 days. Long-lived development branches are hidden costs — they diverge, create merge conflicts, and delay integration. DORA research consistently shows trunk-based development correlates with high-performing engineering teams.

main ──●──●──●──●──●──●──●──●──●──  (always deployable)
        ╲      ╱  ╲    ╱
         ●──●─╱    ●──╱    ← short-lived feature branches (1-3 days)

This is the recommended default. Teams using gitflow or long-lived branches can adapt the principles (atomic commits, small changes, descriptive messages) to their branching model — the commit discipline matters more than the specific branching strategy.

  • Dev branches are costs. Every day a branch lives, it accumulates merge risk.
  • Release branches are acceptable. When you need to stabilize a release while main moves forward.
  • Feature flags > long branches. Prefer deploying incomplete work behind flags rather than keeping it on a branch for weeks.

1. Commit verified increments when authorized

When the task includes commit authority, give each successful increment its own commit. Otherwise, leave verified working-tree changes for the user to review.

Work pattern:
  Implement slice → Test → Verify → Commit → Next slice

Not this:
  Implement everything → Hope it works → Giant commit

Commits are save points. If the next change breaks something, you can revert to the last known-good state instantly.

2. Atomic Commits

Each commit does one logical thing:

# Good: Each commit is self-contained
git log --oneline
a1b2c3d Add task creation endpoint with validation
d4e5f6g Add task creation form component
h7i8j9k Connect form to API and add loading state
m1n2o3p Add task creation tests (unit + integration)

# Bad: Everything mixed together
git log --oneline
x1y2z3a Add task feature, fix sidebar, update deps, refactor utils

Read the full file on GitHub · 236 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. 3d ago First seen · 236 lines · 26 tokens per session scan A c9d62ca343b9

Subscribe to this mod's changes

git-workflow-and-versioning is a skill published in the GitHub repository douglance/sdlc-plugin (4 stars, last pushed 1mo ago), licensed MIT. It adds 26 tokens to every session and 1,875 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

zed-cherry-pick

Cherry-pick one or more merged PRs and/or commits into Zed's preview or stable release branch. Use this whenever the user mentions cherry-picking to preview/stable, a failed cherry-pick run, or wants to manually port fix(es) into a release branch.

zed-industries/zed · 66 tokens

close-task-commit-push-pr

Close the active backlog task (detected from branch name), commit all changes, push to remote, and open a pull request. Use when the user says "close task and ship it", "close task commit push pr", or invokes /close-task-commit-push-pr.

devoxx/DevoxxGenieIDEAPlugin · 64 tokens

ship

Safely bring main up to date, commit intended pending changes, and push to origin/main. Use when the user explicitly asks to ship the current main branch or invokes the repository's ship workflow.

bex-co/bex · 41 tokens

git-push

把项目推送到 GitHub,三种模式自动判断:首次推送(大文件扫描 → 生成 .gitignore → git init → gh 建仓 → 推送)、日常更新(commit + push)、版本发布(打 tag + 建 Release,可附下载文件)。核心原则是安全第一:推之前必扫大文件和敏感文件,宁可多问一句也不把不该推的东西推上去。当用户说"推到GitHub""推送到GitHub""git push""上传到GitHub""提交并推送""发版本""打release""打tag""/git-push"时触发。不适用于:规划哪些功能进哪个版本号(用 issue-pool——本 skill 只负责把已经定好的版本号打成…

yunshu0909/yunshu_skillshub · 223 tokens

ship

Commit, push, and create a PR for staged changes, with confirmation at each step. Use when your work is done and you want to ship.

poshan0126/dotclaude · 32 tokens

git-workflow

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

vstorm-co/pydantic-deepagents · 17 tokens