Git Workflow — Claude Code Skill

A Claude Code skill that enforces a disciplined Gitflow-based development workflow with conventional commits, semantic versioning, and issue-driven branching.

Installation · Usage · What It Enforces · Contributing

---

Installation

Copy the SKILL.md file to your global Claude Code skills directory:

mkdir -p ~/.claude/skills/git-workflow
cp SKILL.md ~/.claude/skills/git-workflow/SKILL.md

The skill will be automatically discovered on the next Claude Code session.

Usage

The skill activates automatically when you ask Claude Code to perform any git operation:

> Commit my changes
> Create a branch for this feature
> Prepare a release for version 1.2.0
> I need to hotfix a production bug

Or invoke directly:

/git-workflow

What It Enforces

Rule	Description
Gitflow branching	main, develop, feature/*, fix/*, hotfix/*, release/*
Conventional Commits	Structured messages — feat:, fix:, docs:, chore:, etc.
Atomic commits	One logical change per commit, no mixed concerns
--no-ff merges	All merges into protected branches preserve branch topology
No AI signatures	No "Co-Authored-By" or "Generated by" lines
Semantic Versioning	MAJOR.MINOR.PATCH with proper bump rules
Issue-driven workflow	Every branch starts from an issue and closes it via PR
PR-only merges	main and develop are never committed to directly
Conventional PR titles	PR titles follow Conventional Commits format

Branch Model

%%{init: { 'theme': 'base', 'themeVariables': { 'git0': '#0969da', 'git1': '#e8590c', 'git2': '#7c3aed', 'git3': '#2da44e', 'git4': '#fe5196', 'git5': '#2da44e', 'git6': '#cf222e', 'gitBranchLabel0': '#ffffff', 'gitBranchLabel1': '#ffffff', 'gitBranchLabel2': '#ffffff', 'gitBranchLabel3': '#ffffff', 'gitBranchLabel4': '#ffffff', 'gitBranchLabel5': '#ffffff', 'gitBranchLabel6': '#ffffff', 'commitLabelFontSize': '11px', 'tagLabelFontSize': '12px' }, 'gitGraph': { 'mainBranchName': 'main', 'rotateCommitLabel': true, 'showCommitLabel': true } } }%%
gitGraph
    commit id: "init"
    commit id: " " tag: "v0.1.0"

    branch develop order: 1
    commit id: "setup"

    branch "feature/1-auth" order: 2
    commit id: "login"
    commit id: "logout"

    checkout develop
    merge "feature/1-auth" id: " merge-1"

    branch "feature/2-search" order: 3
    commit id: "index"
    commit id: "query"

    checkout develop
    branch "fix/3-typo" order: 4
    commit id: "typo"

    checkout develop
    merge "fix/3-typo" id: " merge-3"
    merge "feature/2-search" id: " merge-2"

    branch "release/1.0" order: 1
    commit id: "bump"
    commit id: "changelog"

    checkout main
    merge "release/1.0" id: "  " tag: "v1.0.0"

    checkout develop
    merge main id: " back-merge"

    checkout main
    branch "hotfix/4-crash" order: 2
    commit id: "crash-fix"
    commit id: "patch"

    checkout main
    merge "hotfix/4-crash" id: "   " tag: "v1.0.1"

    checkout develop
    merge main id: " hotfix-sync"

    commit id: "next"

Loading

Pattern	Base	Merges into	Purpose
feature/<issue>-<slug>	develop	develop	New features
fix/<issue>-<slug>	develop	develop	Bug fixes
hotfix/<issue>-<slug>	main	main + develop	Urgent production fixes
release/<version>	develop	main + develop	Release preparation

Commit Format

<type>(<optional scope>): <description>

feat(auth): add OAuth2 login flow
fix: resolve race condition in websocket reconnect
chore(release): prepare 1.2.0
feat!: drop support for Node 16

See SKILL.md for the full specification including commit types, breaking change conventions, versioning rules, release processes, and the complete forbidden operations list.

Contributing

See CONTRIBUTING.md for guidelines.

License

MIT © Qubernetic