Description
git-workflow-and-versioning is an agent skill from Addy Osmani's agent-skills collection that structures git practice for every code change. Its premise is that git is the safety net. Commits are save points, branches are sandboxes, and history is documentation. With AI agents generating code quickly, disciplined version control keeps changes manageable, reviewable and reversible. The skill applies to every code change, since every change flows through git. Its recommended approach is trunk-based development. The main branch should always be deployable, and work should happen in short-lived feature branches that merge back within one to three days. Long-lived development branches are described as hidden costs, because they diverge, produce merge conflicts and delay integration. The skill cites DORA research that links trunk-based development with high-performing teams. It also covers committing, branching, resolving conflicts, and splitting uncommitted work that has become tangled. The skill is listed on skills.sh, with its security audit results shown there. It suits teams and agents that want small, frequent, reviewable changes rather than large, long-running branches.…
Highlights
- Commits as save points, branches as sandboxes
- Trunk-based development
- Short-lived feature branches
- Guidance for conflicts and split work
Ratings & Reviews
No ratings yet
Be the first to rate git-workflow-and-versioning.
People also visit
git-workflow
Git workflow patterns including branching strategies, commit conventions
git-workflow-and-versioning FAQ
What does the git-workflow-and-versioning skill do?
It structures git practice for every code change, covering commits, branches, conflict resolution and splitting tangled work.
How do I install it?
Run: npx skills add https://github.com/addyosmani/agent-skills --skill git-workflow-and-versioning
What branching model does it recommend?
Trunk-based development, with the main branch always deployable and short-lived feature branches that merge within one to three days.
Why avoid long-lived branches?
The skill says they diverge, create merge conflicts and delay integration.
What security checks has it passed?
skills.sh lists three audits: Gen Agent Trust Hub Pass, Socket Pass and Snyk Pass.
What are the best git-workflow-and-versioning alternatives?
Popular alternatives to git-workflow-and-versioning include git-workflow, git-advanced-workflows and git-flow-branch-creator. See all git-workflow-and-versioning alternatives