skills.rest
Qiuyi-Hong
Qiuyi-HongCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow-and-versioning

Structures git commits, branching, and semantic versioning into disciplined workflows.

Updated Sep 15, 2026
Search Tags:#git#changelog#version control#commit#branching#release#semantic versioning
One-click install
npx skills add https://github.com/Qiuyi-Hong/addyosmani-skills --skill git-workflow-and-versioning-qiuyi-hong
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow-and-versioning
Source: https://github.com/Qiuyi-Hong/addyosmani-skills/tree/main/skills/git-workflow-and-versioning
Command: npx skills add https://github.com/Qiuyi-Hong/addyosmani-skills --skill git-workflow-and-versioning-qiuyi-hong

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? AI agents generate code at high speed, and without disciplined version control, changes accumulate into giant unreviewable commits, messy working trees, and releases with no clear version contract. This Skill enforces atomic commits, trunk-based branching, and semantic versioning so every change stays reviewable, revertable, and traceable. ## Core Features & Use Cases - Atomic Commit Discipline: Enforces one logical change per commit with conventional message types (feat, fix, refactor, test, docs, chore) and pre-commit hygiene checks for secrets, tests, and linting. - Trunk-Based Branching & Worktrees: Guides short-lived feature branches merged within 1-3 days, plus git worktree setups so multiple agents work in parallel without interference. - Release & Versioning Contract: Applies semantic versioning (MAJOR.MINOR.PATCH), annotated git tags as the source of truth, and human-readable changelogs grouped by impact. - Use Case: An agent finishes a feature across five incremental commits, splits a messy working tree into clean atomic commits, then cuts release v1.4.0 with a tag and a curated changelog entry. ## Quick Start Ask the agent to organize the current uncommitted changes into clean atomic commits with descriptive messages and prepare a semantic version bump with a changelog entry.

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 split a messy working tree into clean atomic commits?▼

Stage and commit one logical change at a time, keeping each commit self-contained around a single concern. Separate formatting changes from behavior changes and refactors from features so each commit is easy to review and revert.

What is trunk-based development and why use it?▼

Trunk-based development keeps main always deployable with short-lived feature branches merged within 1-3 days. Long-lived branches accumulate merge risk and conflicts, while feature flags let incomplete work ship safely behind toggles.

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

Use major for breaking changes, minor for backward-compatible features, and patch for backward-compatible bug fixes. When unsure whether a change is breaking, assume it is, since consumers may rely on behavior beyond the documented API.

Can multiple AI agents work on the same repo in parallel?▼

Yes, use git worktrees to give each agent its own directory and branch, so parallel work never collides. Run git worktree add for each feature branch, then merge and remove worktrees when done.

What should I check before every git commit?▼

Review the staged diff, scan for secrets like passwords or API keys, run tests, linting, and type checking. Automate these checks with git hooks using tools like lint-staged and husky.

Why is a changelog different from git log output?▼

A changelog is a curated, consumer-facing summary grouped by impact (Added, Changed, Fixed, Deprecated, Removed, Security), while git log is raw commit history. Write changelog entries with each change rather than reconstructing them at release time.

Related Skills

Explore More Software Engineering Skills→
addyosmaniaddyosmani
84.9k

incremental-implementation

Implement software changes in small, testable vertical slices.

Community
Intermediate
EmasoftEmasoft
1

amia-release-management

Automate release governance for versioning, tagging, changelog, and rollback planning.

Community
Advanced
raishoemiraishoemi

code-review-and-quality

Reviews code changes across correctness, readability, architecture, security, and performance before merge.

Community
Intermediate
nebinfranebinfra

neb-standards-git

Standardize Git workflows with conventional commits, branch naming, and release steps.

Official
Advanced