git-workflow-and-versioning
Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when…
What it does
- 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.
- feat — New feature
- fix — Bug fix
- refactor — Code change that neither fixes a bug nor adds a feature
- test — Adding or updating tests
Requirements & configuration
- Release branches are acceptable. When you need to stabilize a release while main moves forward.
- git diff --staged | grep -i "password\|secret\|apikey\|token"
- | "The message doesn't matter" | Messages are documentation. Future you (and future agents) will need to understand what changed and why. |
- | "I don't need a .gitignore" | Until .env with production secrets gets committed. Set it up immediately. |
Configuration: MAJOR
Derived from the skill's own SKILL.md documentation · extracted 2026-07-23
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.
Source
Repository: https://github.com/addyosmani/agent-skills
git-workflow-and-versioning FAQ
What does the git-workflow-and-versioning skill do?
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. 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.
What does git-workflow-and-versioning require?
Release branches are acceptable. When you need to stabilize a release while main moves forward. git diff --staged | grep -i "password\|secret\|apikey\|token" | "The message doesn't matter" | Messages are documentation. Future you (and future agents) will need to understand what changed and why. | | "I don't need a .gitignore" | Until .env with production secrets gets committed. Set it up immediately. | Configuration keys: MAJOR.
How do I install git-workflow-and-versioning?
Run: npx -y skills add https://github.com/addyosmani/agent-skills --skill git-workflow-and-versioning --agent claude-code — the source lives at github.com/addyosmani/agent-skills.
Maintain git-workflow-and-versioning?
Let people know it's listed here — add the badge (live metrics, light/dark aware) or a plain link to your README or docs.
[](https://getagentictools.com/skills/addyosmani-agent-skills-git-workflow-and-versioning?ref=badge) npx agentictools info skills/addyosmani-agent-skills-git-workflow-and-versioning The second line is the CLI lookup for this page — handy in READMEs and docs.
