Git Workflow
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), debugging hook-install failures in git worktrees, or working in a bare-repo plus per-branch-worktree layout, including consolidating a directory that holds both a plain clone and a .bare. The pull-request tooling is GitHub-only; references/pull-request-workflow.md carries the GitLab equivalents. Not for creating releases (use github-release) or diagnosing BLOCKED/won't-merge PRs (use github-project).
- Skill ID
- netresearch/git-workflow-skill/git-workflow
- Publisher
- netresearch
- Repository
- git-workflow-skill
- Installs
- 0
- Files
- 22
- License
- See repository
- Requires
- Requires git, gh CLI; yq for .spec-cleanup.yml.
- Synced
- Sep 23, 2026
Open any RiverX project, open the Skills panel in the chat, and search for this identifier. The files are fetched from the source repository at install time.
netresearch/git-workflow-skill/git-workflowInstalls these files- SKILL.md
- checkpoints.yaml
- evals/evals.json
- references/advanced-git.md
- references/ci-cd-integration.md
- references/claude-code-hooks.md
- references/code-quality-tools.md
- references/commit-conventions.md
- references/git-hooks-setup.md
- references/github-releases.md
- references/merge-gate-watcher.md
- references/no-editorializing.md
- references/pull-request-workflow.md
- references/spec-cleanup.md
- scripts/conflict-marker-gate.py
- scripts/merge-gate.sh
- scripts/pr-merge.sh
- scripts/pr-status.sh
- scripts/repo-contribution-preflight.sh
- scripts/signing-preflight.sh
- scripts/spec-cleanup-guard.sh
- scripts/verify-git-workflow.sh
What this skill tells the agent
Git Workflow Skill
Not Here
Releases: github-release. BLOCKED-PR diagnosis: github-project.
GitHub only. Everything below the branching and commit sections — pr-status.sh, pr-merge.sh, the merge gate, review threads — speaks GitHub GraphQL. For a GitLab merge request the equivalent glab calls are in references/pull-request-workflow.md § GitLab: the same gate with `glab`.
Critical Rules (Non-Negotiable)
- No direct push to main — always open a PR.
- No merge before all threads resolved (
references/pull-request-workflow.md). - No squash unless asked — preserves atomic commits, signatures, bisection.
- No "tested/verified/working" without pasted command output — else say so.
- No edits to installed skill/plugin cache paths (
~/.claude/skills/,~/.claude/plugins/cache/,**/.bare/**) — always the repo worktree, verified bypwd. - Force-push only with `--force-with-lease` — never plain
--force. - Commit before rebase —
add → commit → fetch → rebase → push(a dirty tree aborts it). - No editorializing — state what changed, not how good it is (
references/no-editorializing.md).
Reference Files
| Reference | Content Triggers |
|---|---|
references/commit-conventions.md | Conventional commits, DCO sign-off |
references/pull-request-workflow.md | PR merge gate, signed rebase |
references/ci-cd-integration.md | CI watching, git mirrors |
references/advanced-git.md | Rebase, cherry-pick, bisect, stash, worktrees, reflog |
references/github-releases.md | → github-release skill |
references/git-hooks-setup.md | Hook frameworks, hooks per stage |
references/claude-code-hooks.md | settings.json merge gate, cache-path rejection, auto-lint |
references/code-quality-tools.md | shellcheck, shfmt, git-absorb, difftastic |
references/merge-gate-watcher.md | Waiting on a gate, a watcher the harness killed, merge-driver loop, check taxonomy, stale-SHA rerun |
references/spec-cleanup.md | Planning artifacts off the base branch |
references/no-editorializing.md | No self-praise, no narrating the expected |
Conventional Commits
<type>[scope]: <description>feat MINOR, fix PATCH; full type list and DCO sign-off in references/commit-conventions.md. Breaking: ! after type, or BREAKING CHANGE: in the footer. Branches: feature/TICKET-123-description, release/1.2.0
Hook Detection
ls lefthook.yml .lefthook.yml captainhook.json .pre-commit-config.yaml .husky/pre-commit 2>/dev/null || echo "No hooks"Install commands per framework: references/git-hooks-setup.md.
PR Merge Requirements
Before merging: threads resolved, CI green (incl. annotations), rebased, signed, and reviewed on the current head — by a human, a bot, or the author through pr-merge.sh --self-reviewed. A review is mandatory; a bot review is not, and one is waited for only while it is actually in flight. Rebase-only + signed: git merge --ff-only.
Verification
./scripts/verify-git-workflow.sh /path/to/repository
# Gate state, next action:
./scripts/pr-status.sh [-R owner/repo] [PR] [--json] [--watch]
# Merge; refuses when the gate is shut:
./scripts/pr-merge.sh [-R owner/repo] [PR] [--dry-run|--self-reviewed]
# What a repository expects, before the first artifact:
./scripts/repo-contribution-preflight.sh [--repo <dir>] [--section docs|templates|packaging|ci|tools]
# Which copy is installed here (every script answers this):
./scripts/pr-status.sh --versionContributing: <https://github.com/netresearch/git-workflow-skill>
More from netresearch
Use this skill in a project
Open any RiverX project, search the Skills panel for netresearch/git-workflow-skill/git-workflow, and install it in one click.