Git Workflow And Versioning

This is a comprehensive workflow discipline for keeping AI-generated code manageable through git. It pushes trunk-based development with short-lived branches (1-3 days max), atomic commits around 100 lines, and a save point pattern where every successful increment gets committed immediately. The change summary format is especially practical for AI work: explicitly documenting what you didn't touch prevents scope creep and makes reviews faster. Includes worktree patterns for running multiple agents in parallel and pre-commit hygiene checks. The core insight is that when code generation is fast, version control becomes your primary defense against chaos. Best for teams struggling with large AI-generated PRs or merge conflict hell.

skills.sh installs: 68.8K
GitHub stars: 114.6K
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add addyosmani/agent-skills --skill git-workflow-and-versioning --agent claude-code

Installs into .claude/skills of the current project.

Files

Git Workflow and Versioning

Overview

Git is your safety net. Treat commits as save points, branches as sandboxes, and history as documentation. With AI agents generating code at high speed, disciplined version control is the mechanism that keeps changes manageable, reviewable, and reversible.

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.

SKILL.md on GitHub