# git-workflow-and-versioning

> Claude/Codex skill by [@addyosmani](https://omgskills.com/library/addyosmani/index.md) · 81k stars · Updated 2026-07-26

Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.

Tags: agent-skills, antigravity, claude-code, codex, cursor, skills

## Install

```sh
git clone https://github.com/addyosmani/agent-skills /tmp/agent-skills && ln -s /tmp/agent-skills/skills/git-workflow-and-versioning ~/.claude/skills/git-workflow-and-versioning
```

## From README

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. 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.

## Links

- HTML page: https://omgskills.com/skills/addyosmani/agent-skills/git-workflow-and-versioning/
- GitHub: https://github.com/addyosmani/agent-skills
- Author: [@addyosmani](https://omgskills.com/library/addyosmani/index.md)

## More from this repo

- [api-and-interface-design](https://omgskills.com/skills/addyosmani/agent-skills/skills/api-and-interface-design/index.md) — Guides stable API and interface design.
   - [@addyosmani](https://omgskills.com/library/addyosmani/index.md) · 93k stars
- [constraint-driven-development](https://omgskills.com/skills/addyosmani/agent-skills/skills/constraint-driven-development/index.md) — Establishes a project's quality bar as a written contract and stops agents quietly lowering it.
   - [@addyosmani](https://omgskills.com/library/addyosmani/index.md) · 91k stars
- [doubt-driven-development](https://omgskills.com/skills/addyosmani/agent-skills/skills/doubt-driven-development/index.md) — Subjects every non-trivial decision to a fresh-context adversarial review before it stands.
   - [@addyosmani](https://omgskills.com/library/addyosmani/index.md) · 87k stars