gh-pr-merge-worktree-checkout-trap

gh-pr-merge-worktree-checkout-trap is a skill for Claude Code from wan-huiyan/agent-traffic-control. It costs 497 tokens per session (3,765 once invoked), scanned A, original, MIT.

A troubleshooting guide for a GitHub pull-request merge command that reports that the target branch is already used by another Git worktree. A Git worktree is another working directory connected to the same repository.

In plain words
What is it for?
Use it when gh pr merge with squash, merge, or rebase fails because the destination branch is checked out in another worktree. It helps confirm the merge and handle the local checkout safely.
Why use it?
It explains that the merge on GitHub may already have succeeded and that only GitHub CLI's local branch switch failed, preventing unnecessary retries or panic.

Skill for Claude Code

Written for Claude Code: disable-model-invocation in frontmatter. Also seen: mentions Claude Code.

Part of the agent-traffic-control plugin — 107 skills shipped together

Good fit Use it when gh pr merge with squash, merge, or rebase fails because the destination branch is checked out in another worktree. It helps confirm the merge and handle the local checkout safely.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/wan-huiyan/agent-traffic-control/gh-pr-merge-worktree-checkout-trap
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent
npx skills add wan-huiyan/agent-traffic-control --skill gh-pr-merge-worktree-checkout-trap
Clone the repo
git clone --depth 1 https://github.com/wan-huiyan/agent-traffic-control

Made for: Claude Code.

Or install agent-traffic-control, the plugin that ships this one along with the rest of its 107 skills.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for gh-pr-merge-worktree-checkout-trap

README.md
[![agentmods](https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/gh-pr-merge-worktree-checkout-trap/github.svg)](https://agentmods.dev/skills/wan-huiyan/agent-traffic-control/gh-pr-merge-worktree-checkout-trap)
Your own site
<a href="https://agentmods.dev/skills/wan-huiyan/agent-traffic-control/gh-pr-merge-worktree-checkout-trap"><img src="https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/gh-pr-merge-worktree-checkout-trap/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for gh-pr-merge-worktree-checkout-trap

Your own site · 80×15
<a href="https://agentmods.dev/skills/wan-huiyan/agent-traffic-control/gh-pr-merge-worktree-checkout-trap"><img src="https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/gh-pr-merge-worktree-checkout-trap.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 497 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 3,765 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00497 $0.03765
Opus 5 $0.00249 $0.01883
Sonnet 5 $0.00099 $0.00753
Haiku 4.5 $0.00050 $0.00377

Measured 12d ago against content hash e11bdf74a304, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-12, from the pricing page.

Security

Grade A, and why

gh-pr-merge-worktree-checkout-trap scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 12d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

plugins/agent-traffic-control/skills/gh-pr-merge-worktree-checkout-trap/SKILL.md · 305 lines

How it starts

The opening of the file, as written. The whole thing — 305 lines — stays where its author put it; the contents beside it link to each section on GitHub.

gh pr merge Worktree-on-Main Checkout Trap

Problem

gh pr merge --squash --delete-branch (and similar commands) fail with:

failed to run git: fatal: 'main' is already used by worktree at '/path/to/another/worktree'

even when the user has every right to merge the PR. The error makes it look like the merge failed, prompting the user to retry or panic.

The merge actually succeeded on GitHub. Only gh's post-merge local side-effect — switching the local working tree to main so it's "ready" after the merge — failed because git refuses to check out a branch that's already checked out in another worktree.

Context / Trigger Conditions

You are in the right place if all of these are true:

  • You ran gh pr merge <number> (any merge mode: --squash / --merge / --rebase).
  • The exact error includes fatal: 'main' is already used by worktree at.
  • The repo has multiple git worktree entries (run git worktree list to confirm).
  • One of those worktrees is on main (or whichever branch the PR merged into).

The command's first action is the GitHub merge API call; the local checkout is downstream of that. Failures in the local step do NOT roll back the merge.

Solution

Step 1: Verify the merge actually happened

gh pr view <number> --json state,mergedAt
# {"state":"MERGED","mergedAt":"YYYY-MM-DDTHH:MM:SSZ"}

If state is MERGED: the PR is merged. The error was a local cleanup side-effect, not a merge failure. You can stop here. Optionally clean up local artifacts:

# delete the remote branch (gh's --delete-branch flag also failed silently)
git push origin --delete <feature-branch-name>

# delete the local feature branch (it's already orphaned by the merge)
git branch -D <feature-branch-name>

# remove the worktree you used to develop the feature
git worktree remove .claude/worktrees/<your-feature-worktree>

# prune stale worktree refs
git worktree prune

If state is OPEN or CLOSED (without merge): something else went wrong. The worktree error is masking a real failure. Re-run the merge with --admin or check branch protection / required checks.

Read the full file on GitHub · 305 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 12d ago First seen · 305 lines · 497 tokens per session scan A e11bdf74a304

Subscribe to this mod's changes

gh-pr-merge-worktree-checkout-trap is a skill published in the GitHub repository wan-huiyan/agent-traffic-control (3 stars, last pushed yesterday), licensed MIT. It adds 497 tokens to every session and 3,765 once invoked, about $0.0025 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Related

Other skills, from other repositories

ql-housekeep

Detect repo-hygiene issues that accumulate during long-running autonomous development (merge-conflict markers, orphan worktrees, CPC-variant duplicates, stale branches, version-manifest drift). Detection-only by default — reports findings, never deletes or modifies without explicit user confirmation.

andyzengmath/quantum-loop · 57 tokens

nazgul:doctor

Run the Nazgul read-only preflight diagnostic — checks jq/gh presence and auth, git-hooks drift, cache-vs-repo plugin version, the bash-vs-zsh hazard, the NAZGULDIR footgun, config-schema staleness, either install mode's .gitignore Nazgul-block drift (stamp and flush-left region), cross-session messaging and Remote…

OrodruinLabs/nazgul · 151 tokens

hotfix

Emergency fix workflow that bypasses normal sprint processes with a full audit trail. Creates hotfix branch, tracks approvals, and ensures the fix is backported correctly.

IdoCohen560/claude-unity-game-studio · 35 tokens

cloudflare-workers-ci-cd

Complete CI/CD guide for Cloudflare Workers using GitHub Actions and GitLab CI. Use for automated testing, deployment pipelines, preview environments, secrets management, or encountering deployment failures, workflow errors, environment configuration issues.

secondsky/claude-skills · 50 tokens

cloudflare-workers-observability

Cloudflare Workers observability with logging, Analytics Engine, Tail Workers, metrics, and alerting. Use for monitoring, debugging, tracing, or encountering log parsing, metric aggregation, alert configuration errors.

secondsky/claude-skills · 47 tokens

cloudflare-workers-dev-experience

Cloudflare Workers local development with Wrangler, Miniflare, hot reload, debugging. Use for project setup, wrangler.jsonc configuration, or encountering local dev, HMR, binding simulation errors.

secondsky/claude-skills · 47 tokens