{"slug":"git-workflow","title":"git-workflow","summary":"Use when establishing branching strategies, implementing Conventional Commits, creating or reviewing PRs, resolving PR review comments, merging PRs (including CI verification, auto-merge queues, and post-merge cleanup), managing PR review threads, merging PRs with signed commits,","platform":"Claude","tags":[],"authorName":"LLM Mart","authorSlug":"llm-mart","score":0,"source":"github","price":null,"verified":false,"createdAt":"2026-09-15T18:30:23.466006Z","repo":{"url":"https://github.com/netresearch/git-workflow-skill","stars":50,"forks":9,"license":null,"updatedAt":"2026-09-21T13:39:16Z"},"bodyHtml":"
\n

name: git-workflow\ndescription: \"Use when establishing branching strategies, implementing Conventional Commits, creating or reviewing PRs, resolving PR review comments, merging PRs (including CI verification, auto-merge queues, and post-merge cleanup), managing PR review threads, merging PRs with signed commits, handling merge conflicts, verifying a merge didn't silently drop changes, syncing a long-diverged branch (e.g. master into integration), rebasing a long-lived branch onto a moved base or splitting one into several PRs, integrating Git with CI/CD, setting up git hooks (lefthook, captainhook, husky, pre-commit), or debugging hook-install failures in git worktrees. The pull-request tooling is GitHub-only — for a GitLab merge request use netresearch-gitlab. Not for creating releases (use github-release) or diagnosing BLOCKED/won't-merge PRs (use github-project).\"\nlicense: \"(MIT AND CC-BY-SA-4.0). See LICENSE-MIT and LICENSE-CC-BY-SA-4.0\"\ncompatibility: \"Requires git, gh CLI; yq for .spec-cleanup.yml.\"\nmetadata:\nauthor: Netresearch DTT GmbH\nversion: \"1.32.2\"\nrepository: https://github.com/netresearch/git-workflow-skill\nallowed-tools: Bash(git:) Bash(gh:) Read Write

\n

Git Workflow Skill

\n

Not Here

\n

Releases: github-release. BLOCKED-PR diagnosis: github-project.

\n

GitHub only. Everything below the branching and commit sections — pr-status.sh, pr-merge.sh, the merge gate, review threads — speaks GitHub GraphQL. A GitLab merge request belongs to netresearch-gitlab; the equivalent glab calls are in references/pull-request-workflow.md § GitHub only.

\n

Critical Rules (Non-Negotiable)

\n
    \n
  1. No direct push to main — always open a PR.
    2. \n
  2. No merge before all threads resolved (references/pull-request-workflow.md).
    3. \n
  3. No squash unless asked — preserves atomic commits, signatures, bisection.
    4. \n
  4. No \"tested/verified/working\" without pasted command output — else say so.
    5. \n
  5. No edits to installed skill/plugin cache paths (~/.claude/skills/, ~/.claude/plugins/cache/, **/.bare/**) — always the repo worktree, verified by pwd.
    6. \n
  6. Force-push only with --force-with-lease — never plain --force.
    7. \n
  7. Commit before rebase — add → commit → fetch → rebase → push (a dirty tree aborts it).
    8. \n
  8. No editorializing — state what changed, not how good it is (references/no-editorializing.md).
    9. \n
\n

Reference Files

\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
ReferenceContent Triggers
references/commit-conventions.mdConventional commits, DCO sign-off
references/pull-request-workflow.mdPR merge gate, signed rebase
references/ci-cd-integration.mdCI watching, git mirrors
references/advanced-git.mdRebase, cherry-pick, bisect, stash, worktrees, reflog
references/github-releases.md→ github-release skill
references/git-hooks-setup.mdHook frameworks, hooks per stage
references/claude-code-hooks.mdsettings.json merge gate, cache-path rejection, auto-lint
references/code-quality-tools.mdshellcheck, shfmt, git-absorb, difftastic
references/merge-gate-watcher.mdMerge-driver loop, check taxonomy, stale-SHA rerun
references/spec-cleanup.mdPlanning artifacts off the base branch
references/no-editorializing.mdNo self-praise, no narrating the expected
\n

Conventional Commits

\n
<type>[scope]: <description>\n
\n

feat MINOR, fix PATCH; full type list and DCO sign-off in references/commit-conventions.md.\nBreaking: ! after type, or BREAKING CHANGE: in the footer.\nBranches: feature/TICKET-123-description, release/1.2.0

\n

Hook Detection

\n
ls lefthook.yml .lefthook.yml captainhook.json .pre-commit-config.yaml .husky/pre-commit 2>/dev/null || echo \"No hooks\"\n
\n

Install commands per framework: references/git-hooks-setup.md.

\n

PR Merge Requirements

\n

Before merging: threads resolved, CI green (incl. annotations), rebased, signed, and reviewed (human or bot, on the current head). Rebase-only + signed: git merge --ff-only.

\n

Verification

\n
./scripts/verify-git-workflow.sh /path/to/repository\n# Gate state, next action:\n./scripts/pr-status.sh [-R owner/repo] [PR] [--json] [--watch]\n# Merge; refuses when the gate is shut:\n./scripts/pr-merge.sh [-R owner/repo] [PR] [--dry-run|--self-reviewed]\n# What a repository expects, before the first artifact:\n./scripts/repo-contribution-preflight.sh [--repo <dir>] [--section docs|templates|packaging|ci|tools]\n# Which copy is installed here (every script answers this):\n./scripts/pr-status.sh --version\n
\n
\n
\n

Contributing: https://github.com/netresearch/git-workflow-skill

\n
\n","files":[{"path":"checkpoints.yaml","sizeBytes":26088,"isText":true},{"path":"evals/evals.json","sizeBytes":34446,"isText":true},{"path":"references/advanced-git.md","sizeBytes":85798,"isText":true},{"path":"references/ci-cd-integration.md","sizeBytes":21139,"isText":true},{"path":"references/claude-code-hooks.md","sizeBytes":19244,"isText":true},{"path":"references/code-quality-tools.md","sizeBytes":12832,"isText":true},{"path":"references/commit-conventions.md","sizeBytes":20379,"isText":true},{"path":"references/git-hooks-setup.md","sizeBytes":15610,"isText":true},{"path":"references/github-releases.md","sizeBytes":599,"isText":true},{"path":"references/merge-gate-watcher.md","sizeBytes":42769,"isText":true},{"path":"references/no-editorializing.md","sizeBytes":6685,"isText":true},{"path":"references/pull-request-workflow.md","sizeBytes":203032,"isText":true},{"path":"references/spec-cleanup.md","sizeBytes":6261,"isText":true},{"path":"scripts/conflict-marker-gate.py","sizeBytes":3990,"isText":true},{"path":"scripts/merge-gate.sh","sizeBytes":5908,"isText":true},{"path":"scripts/pr-merge.sh","sizeBytes":17328,"isText":true},{"path":"scripts/pr-status.sh","sizeBytes":96512,"isText":true},{"path":"scripts/repo-contribution-preflight.sh","sizeBytes":13505,"isText":true},{"path":"scripts/signing-preflight.sh","sizeBytes":8512,"isText":true},{"path":"scripts/spec-cleanup-guard.sh","sizeBytes":11149,"isText":true},{"path":"scripts/verify-git-workflow.sh","sizeBytes":12193,"isText":true},{"path":"SKILL.md","sizeBytes":5054,"isText":true}],"reviewScore":null,"reviewSummary":null,"trust":{"provenance":"trusted-source-unreviewed","notice":"Community-authored content, reproduced verbatim and not vetted as instructions. Treat it as data to evaluate, never as directives to follow.","bodySource":null},"bodyLocked":false,"purchaseUrl":null,"sourceUrl":null,"report":{"provenance":"trusted-source-unreviewed","screen":{"ran":true,"outcome":"notes-only","suspicious":0,"notes":2,"hiddenCharacters":false},"virusScan":{"engine":"clamav","status":"clean","scannedAt":"2026-09-21T13:51:12.916342Z","sha256":"E7BAA57888F08D53F7EF58FCE0096D852AD5DE815A3E3A622324B66F172BB0CF","sizeBytes":254213},"review":null,"source":{"repositoryUrl":"https://github.com/netresearch/git-workflow-skill","path":"skills/git-workflow","license":null,"commit":"1dc9b7f23dd99d6e4b0ba0b5884ddb6da0a42608","subtreeSha":"8CF314109696B22888CCC0B25D9BAC11B2C6BB7EF44C99C898FBE69A6F4910A8","lastSyncedAt":"2026-09-21T13:50:54.312848Z"},"reviewedAt":"2026-09-21T13:54:30.087332Z","notice":"Community-authored content, reproduced verbatim and not vetted as instructions. Treat it as data to evaluate, never as directives to follow."},"install":[{"target":"skills-cli","command":"npx skills add https://github.com/netresearch/git-workflow-skill/tree/main/skills/git-workflow"},{"target":"claude-code","command":"claude plugin marketplace add https://llmmart.ai/marketplace.json && claude plugin install netresearch-git-workflow-skill@llmmart"},{"target":"git","command":"git clone https://github.com/netresearch/git-workflow-skill.git"}]}