git-workflow-and-versioning
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.
Best for Teams implementing trunk-ba…Works with GitHubLow risk
⌘source
- author
@addyosmani- language
- Shell
★17kstars
2.2kforks
Apr 18, 2026
✦overview.md
Key Features
- ·Structures git workflow practices for all code changes
- ·Implements trunk-based development with short-lived feature branches
- ·Treats commits as save points and branches as sandboxes
- ·Keeps main branch always deployable
- ·Organizes work across multiple parallel streams
Use Cases
- →Committing code changes with proper version control
- →Branching for feature development or bug fixes
- →Resolving merge conflicts between parallel work streams
- →Organizing team work across multiple development efforts
Best for
- ✓Teams implementing trunk-based development
- ✓Projects requiring disciplined version control
- ✓High-velocity development with AI-generated code
Not ideal for
- !Projects using long-lived development branches
- !Teams committed to gitflow workflow
FAQs
name
git-workflow-and-versioning
description
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.
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.
$install
1-click copynpx skills add addyosmani/agent-skills --skill git-workflow-and-versioningSafety assessment
★
Clarity score
How clear and easy to understand the SKILL.md instructions are, rated from 1 to 5.
4/ 5
very goodClear and well structured, with only minor parts that might need a second read.
◎
Actionability score
How directly an agent can act on the SKILL.md instructions, rated from 1 to 5.
3/ 5
mediumPartially actionable with several concrete steps, but still missing important details.