Agent skill · software engineering · sickn33
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.
Why this skill is useful
Codifies git workflow practices and commit message standards that the AI could infer but now doesn't have to guess.
What it needs
About 6k tokens when loaded. Last updated 2026-08-07. 44,571 stars on the source repository.
What this skill does
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. 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. 1. Commit Early, Commit Often Each successful increment gets its own commit. Don't accumulate large uncommitted changes. Commits are save points. If the next change breaks something, you can revert to the last known-good state instantly. 2. Atomic Commits Each commit does one logical thing: 3. Descriptive Messages Commit messages explain the why, not just the what: Format: Types: feat — New feature fix — Bug fix refactor — Code change that neither fixes a bug nor adds a feature test — Adding or updating tests docs — Documentation only chore — Tooling, dependencies, config 4. Keep Concerns Separate Don't combine formatting changes with behavior changes. Don't combine refactors with features. …
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills sickn33/git-workflow-and-versioning