git-workflow-and-versioning

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

Made for: Claude Code, Codex.

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. 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.00040 $0.02764
Opus 5 $0.00020 $0.01382
Sonnet 5 $0.00008 $0.00553
Haiku 4.5 $0.00004 $0.00276

Measured 2d ago against content hash 85129fe68a3f, 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 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-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. 2d 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 2mo ago), licensed MIT. It adds 40 tokens to every session and 2,764 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

code-review-and-quality

执行多维度代码审查。用于合并任何变更之前;用于审查自己、其他 agent 或人类编写的代码;用于在代码进入主分支前从多个维度评估代码质量。.

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

doubt-driven-development

在每个非平凡决策成立前,用全新上下文进行对抗式审查。当正确性比速度更重要、处理不熟悉代码、风险较高(生产、安全敏感逻辑、不可逆操作),或任何自信输出现在验证比之后调试更便宜时使用。.

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

test-driven-development

用测试驱动开发。用于实现任何逻辑、修复任何 bug,或改变任何行为。用于需要证明代码能工作、收到 bug 报告,或即将修改现有功能时。.

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

ci-cd-and-automation

自动化 CI/CD pipeline 设置。用于设置或修改构建和部署 pipeline 时;用于需要自动化质量门禁、在 CI 中配置 test runners,或建立部署策略时。.

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

code-simplification

为清晰度简化代码。用于在不改变行为的前提下重构代码以提升清晰度;用于代码能运行但比应有状态更难阅读、维护或扩展时;用于审查已累积不必要复杂度的代码时。.

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

context-engineering

优化 agent 上下文设置。当开始新会话、agent 输出质量下降、在任务之间切换,或需要为项目配置规则文件和上下文时使用。.

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