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 conf

By netresearch · 635 installs

npx skills add netresearch/git-workflow-skill --skill git-workflow

Source repository · Upstream listing

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) 1. No direct push to main — always open a PR. 2. No merge before all threads resolved ( references/pull request workflow.md ). 3. No squash unless asked — preserves atomic commits, signatures, bisection. 4. No "tested/verified/working" without pasted command output — else say so. 5. No edits to installed skill/plugin cache paths ( ~/.claude/skills/ , ~/.claude/plugins/cache/ , /.bare/ ) — always the repo worktree, verified by pwd . 6. Force push only with force with lease — never plain force . 7. Commit before rebase — add → commit → fetch → rebase → push (a dirty tree aborts it). 8. 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, posting a review with inline suggestions references/ci cd integration.md CI watching, git mirrors references/advanced git.md Rebase (incl. non interactive rebase i ), cherry pick, bisect, stash, worktrees, reflog, hanging push/fetch (SSH mux), parsing git output in a script (flags that pin diff/log/status output against user config), fetching one branch in a single branch clone (refspec) 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 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 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 Contributing: <https://github.com/netresearch/git workflow skill