skills.rest
nicorevo
nicorevoCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow-and-versioning

Structures git commits, branching, semantic versioning, and changelog practices for code changes.

Updated May 21, 2026
Search Tags:#git#changelog#version control#worktrees#branching#semantic versioning#commit conventions
One-click install
npx skills add https://github.com/nicorevo/AI-SDLC-Template --skill git-workflow-and-versioning-nicorevo
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow-and-versioning
Source: https://github.com/nicorevo/AI-SDLC-Template/tree/main/.opencode/skills/git-workflow-and-versioning
Command: npx skills add https://github.com/nicorevo/AI-SDLC-Template --skill git-workflow-and-versioning-nicorevo

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? AI agents generate code at high speed, and without disciplined version control, changes become unreviewable, irreversible, and untraceable. This Skill enforces atomic commits, short-lived branches, semantic versioning, and curated changelogs so every change stays manageable and every release communicates clearly to consumers. ## Core Features & Use Cases - Commit Discipline: Enforces atomic commits with conventional message types (feat, fix, refactor, test, docs, chore), pre-commit hygiene checks, and the save-point pattern so no more than one increment of work is ever lost. - Branching & Parallel Work: Provides trunk-based development guidance, branch naming conventions, and git worktree workflows so multiple agents can work in parallel without interfering. - Release & Versioning: Defines semantic versioning rules (MAJOR/MINOR/PATCH), tag-as-source-of-truth releases, and human-readable changelogs grouped by Added/Changed/Fixed/Deprecated/Removed/Security. - Use Case: An agent finishes a feature slice, runs tests and lint, commits with a descriptive conventional message, and when cutting a release, tags v1.4.0 and writes a consumer-facing changelog entry in the same change. ## Quick Start Ask the agent to commit the current changes as atomic commits with conventional messages and verify no secrets are staged.

Frequently Asked Questions about git-workflow-and-versioning

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I write good git commit messages?▼

Use the format 'type: short description' with types like feat, fix, refactor, test, docs, or chore, followed by an optional body explaining why the change was made. The message should explain intent, not just restate what the diff shows.

What is trunk-based development and should I use it?▼

Trunk-based development keeps main always deployable with short-lived feature branches merged within 1-3 days. DORA research correlates it with high-performing teams, and it avoids the merge risk that long-lived branches accumulate.

How do I run multiple AI agents on the same repo in parallel?▼

Use git worktrees to create separate directories, each checked out to its own branch, so agents work simultaneously without branch switching or interference. Remove the worktree after merging to clean up.

How do I choose between major, minor, and patch version bumps?▼

Bump MAJOR for breaking changes, MINOR for backward-compatible new functionality, and PATCH for backward-compatible fixes. When unsure whether a change is breaking, assume it is, since a surprise major is cheaper than a broken consumer.

Why shouldn't I generate a changelog from git log?▼

Commit logs are written for developers, while changelogs are curated for consumers and grouped by impact (Added, Changed, Fixed, Deprecated, Removed, Security). Write each changelog entry in the same change that introduces it, not reconstructed at release time.

Related Skills

Explore More Software Engineering Skills→
Threat-Vector-SecurityThreat-Vector-Security
11

incremental-implementation

Plan and implement multi-file features in small, tested increments.

Official
Basic
grasberggrasberg
3

release-manager

Automate changelog generation, version bumps, and GitHub releases.

Community
Intermediate
atelier-fashionatelier-fashion
159

reflect

Audit recent code changes for correctness, conventions, architecture, and testing.

Official
Advanced
lety-ailety-ai

pr-staging

Create a release branch, bump version to RC, and open a PR to staging.

Official
Advanced