git-workflow-and-versioning

git-workflow-and-versioning is a skill for Claude Code from borhen68/SkillEngine. It costs 40 tokens per session (2,764 once invoked), scanned A, original, MIT.

Guidance for organizing Git work, including commits, branches, merges, and conflict resolution. Git is a system for tracking code changes and restoring earlier versions.

In plain words
What is it for?
Planning commits, creating short-lived branches, resolving conflicts, and coordinating parallel code changes.
Why use it?
It keeps changes reviewable and recoverable while reducing confusion when several pieces of work are developed at once.

Skill for Claude Code

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

Needs its repository: it reads a path above its own folder, which exists only inside the repository. The line is git worktree add ../project-feature-a feature/task-creation.

Part of the skillengine plugin — 28 skills, 9 commands, 5 agents, 1 hook shipped together

Good fit Planning commits, creating short-lived branches, resolving conflicts, and coordinating parallel code changes.

Compare 6 skills from other repositories ↓
Install

Getting it into your agent

It runs from inside its repository, so the clone comes first — what it calls does not travel with the file alone.

Clone the repo
git clone --depth 1 https://github.com/borhen68/SkillEngine
agentmods
npx agentmods add skills/borhen68/skillengine/git-workflow-and-versioning

Made for: Claude Code.

Or install skillengine, the plugin that ships this one along with the rest of its 28 skills, 9 commands, 5 agents, 1 hook.

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/borhen68/skillengine/git-workflow-and-versioning/github.svg)](https://agentmods.dev/skills/borhen68/skillengine/git-workflow-and-versioning)
Your own site
<a href="https://agentmods.dev/skills/borhen68/skillengine/git-workflow-and-versioning"><img src="https://agentmods.dev/badge/skills/borhen68/skillengine/git-workflow-and-versioning/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-and-versioning

Your own site · 80×15
<a href="https://agentmods.dev/skills/borhen68/skillengine/git-workflow-and-versioning"><img src="https://agentmods.dev/badge/skills/borhen68/skillengine/git-workflow-and-versioning.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 40 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 2,764 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.00040 $0.02764
Opus 5.5 $0.00016 $0.01106
Sonnet 5.5 $0.00008 $0.00553
Haiku 4.5 $0.00004 $0.00276

Measured 1mo ago against content hash 85129fe68a3f, 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-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 1mo 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-and-versioning/SKILL.md · 332 lines

How it starts

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

Git Workflow and Versioning

Overview

When AI agents generate code at machine speed, version control becomes your only safety mechanism. Without it, a single bad generation can overwrite hours of work irreversibly. With it, every change is a save point you can inspect, revert, or compare.

The git contract: Every meaningful change gets its own commit with a clear message. Branches are short-lived (1-3 days max). History tells a story an engineer can follow. Commits are small enough to review in under 10 minutes. This isn't bureaucracy — it's the difference between confident experimentation and fearful coding.

Real-world impact: DORA research consistently shows trunk-based development correlates with elite engineering performance. Teams that merge small changes frequently have 60% fewer integration failures and recover from incidents 2x faster. Large, long-lived branches are where code goes to die — or worse, to create merge conflicts that take days to resolve.

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.

Read the full file on GitHub · 332 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. 1mo ago First seen · 332 lines · 40 tokens per session scan A 85129fe68a3f

Subscribe to this mod's changes

git-workflow-and-versioning is a skill published in the GitHub repository borhen68/SkillEngine (17 stars, last pushed 4mo ago), licensed MIT. It adds 40 tokens to every session and 2,764 once invoked, about $0.0002 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-30.

Related

Other skills, from other repositories

git-workflow-and-versioning

Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, splitting uncommitted work in a messy working tree into clean atomic commits, opening or reviewing a pull request (PR), pushing to a remote, or when you need to organize work across multiple…

addyosmani/agent-skills · 89 tokens

git-workflow-and-versioning

A guide to using Git, a system for tracking code changes, branches, and saved versions. It recommends small, focused commits and short-lived feature branches while keeping the main branch deployable.

vinvcn/addyosmani-agent-skills-zh · 97 tokens

shipping-and-launch

A production-release checklist and planning guide for putting software in front of real users. It covers testing, security, monitoring, staged rollout, and rollback, which means returning to the previous working version.

vinvcn/addyosmani-agent-skills-zh · 49 tokens

commit

Group unstaged changes into atomic commits by concern, matching repository style. Use when asked to "commit", "create a commit", or "commit changes". Don't use for pushing or pull requests (/to-pr).

helderberto/agent-skills · 44 tokens

git-workflow

Trunk-based development with atomic commits, clean history, and meaningful commit messages. Every commit should be deployable.

DevelopersGlobal/ai-agent-skills · 27 tokens

chinese-commit-conventions

A Chinese-language guide to Conventional Commits, a format for writing consistent Git commit messages, plus related changelog, commit-checking, and commit-helper configuration.

jnMetaCode/superpowers-zh · 65 tokens