claude

git-workflow

Hard-won gotchas from real git and gh workflows: PR create/merge quirks, worktree races, rebase in non-interactive shells, squash-merge diagnosis, and deadlock recovery via plumbing.

0 on GitHubby Raul Cajiasv0.1.0MITupdated 1 month ago
/

Plugin git-workflow from marketplace claude-skills in cajias/claude-skills. Commands read from the repo's manifest — 1 month ago.

What it installs

Skills (6)

  • gh-pr-create-must-push-error

    Fix for "aborted: you must first push the current branch to a remote, or use the --head flag" from `gh pr create` when the branch IS already pushed. Use when: (1) `git push -u origin <branch>` succeeded moments earlier, (2) `git branch -vv` shows upstream tracking is set, (3) `gh pr create` still re

  • gh-pr-merge-in-worktrees

    Recover from `gh pr merge --delete-branch` appearing to fail inside a git worktree. Use when: (1) `gh pr merge 2 --delete-branch` prints `failed to run git: fatal: '<branch>' is already used by worktree at '<path>'`, (2) you suspect the PR merged anyway despite the error, (3) you see a merged PR wit

  • git-deadlock-plumbing-recovery

    Diagnose and recover git operations that HANG / DEADLOCK at ~0% CPU on macOS (APFS) — git commit, git reset, git gc/repack, git push, and even git status never returning. Use when: (1) a git write op "takes forever" / never finishes; (2) `ps` shows the git process in interruptible sleep (STAT S/SN)

  • git-rebase-continue-editor-noninteractive

    Fix for `git rebase --continue` failing in non-interactive shells with the misleading error `"there was a problem with the editor 'nano'"` / `"could not commit staged changes"`. Use when: (1) you ran `git rebase --continue` after manually resolving a merge conflict via `git add`, in a non-interactiv

  • git-squash-merge-tree-hash-diagnosis

    Diagnose and clean up a local branch that appears "N commits ahead of main" after its PR was squash-merged on GitHub, but whose work is actually fully integrated. Use when: (1) `git log main..HEAD` shows multiple commits but the matching PR is closed/merged on GitHub; (2) `git pull --ff-only` on `ma

  • parallel-subagent-git-worktree-race

    Fix/avoid HEAD+index corruption when running parallel Claude Code subagents (Agent tool) that each mutate git (checkout/rebase/reset) in what you THOUGHT were isolated worktrees. Use when: (1) you spawned 2+ agents with isolation:"worktree" to rebase/merge/commit different branches concurrently; (2)

View source on GitHub

More from cajias/claude-skills

All 19 plugins →

Hard-won gotchas from authoring and distributing Claude Code plugins, skills, hooks, and Workflow scripts. Bundles APM packaging traps, plugin cache and marketplace path failures, hook main-vs-subagent detection, Workflow meta parsing breaks, and orchestration verification playbooks.

16 skills

0

rsi-loop

claude

AIDE²-style recursive self-improvement loop: an outer agent iteratively rewrites an inner tree-search research agent, keeping a rewrite only when it beats the incumbent on private held-out scores under a fixed budget across an optimization / ML-engineering / harness-engineering battery. Standalone /rsi:autoresearch solves tasks by tree search; /rsi:init + /rsi:step + /rsi:run drive the outer loop.

2 skills · 6 commands · 2 agents · hooks

0

Design-and-build process skills: layered design docs, C4 architecture artifacts, Diataxis documentation, README authoring, a milestone execution harness, milestone goal-prompt generation, positive-framing spec guidance, and a schema drift playbook.

8 skills

0

Operational gotchas and references for third-party integrations driven from Claude Code — Cloudflare Workers, Grafana, Notion, OpenPencil, Playwright, and MCP file transport.

7 skills

0

ci-build

claude

Hard-won gotchas from CI pipelines and build environments: GitHub Actions, Copilot CLI headless runs, cron block generation, Docker on Apple Silicon, and TypeScript monorepo scaffolding.

5 skills

0

Hard-won gotchas from the Python toolchain: importlib class identity, pip/PyPI name collisions, mock.patch.object vs __slots__, ruff on notebooks, and uv in fresh worktrees.

5 skills

0

Similar plugins

Commands for git commit workflows including commit, push, and PR creation

3 commands

anthropics/claude-code 155,476

ruflo-swarm

claudecodex

Agent teams, swarm coordination, Monitor streams, and worktree isolation

2 skills · 2 commands · 2 agents

ruvnet/ruflo 81,589

headroom

claude

Headroom startup hooks for Claude Code and GitHub Copilot CLI.

hooks

headroomlabs-ai/headroom 79,508

last30days

claudecodex

Research any topic across Reddit, X, YouTube, TikTok, Instagram, Hacker News, Polymarket, GitHub, and 5+ more sources. AI agent scores by upvotes, likes, and real money - not editors.

1 skill

mvanhorn/last30days-skill 67,453

Perform AI code review on Git diffs — supports workspace changes, branch ranges, and single commits with concurrent per-file analysis, codebase search, and deep context-aware review.

2 commands

alibaba/open-code-review 50,068

greptile

claudecodex

AI code review agent for GitHub and GitLab. View and resolve Greptile's PR review comments, run reviews on your working branch, and search your organization's knowledge base and coding patterns, directly from Claude Code.

2 skills · 1 MCP server

anthropics/claude-plugins-official 47,076

Maintain git-workflow?

This page updates itself from your repo. Add the badge to your README, or get it Featured to pin it above the organic results with a followed link to your site.

claude & codex plugins19 plugins