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.
npx skills add wan-huiyan/agent-traffic-control --skill pr-conflict-from-mid-flight-mergesgit clone --depth 1 https://github.com/wan-huiyan/agent-traffic-controlWrote 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.
[](https://agentmods.dev/skills/wan-huiyan/agent-traffic-control/pr-conflict-from-mid-flight-merges)<a href="https://agentmods.dev/skills/wan-huiyan/agent-traffic-control/pr-conflict-from-mid-flight-merges"><img src="https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/pr-conflict-from-mid-flight-merges/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.
<a href="https://agentmods.dev/skills/wan-huiyan/agent-traffic-control/pr-conflict-from-mid-flight-merges"><img src="https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/pr-conflict-from-mid-flight-merges.svg" alt="Reviewed on agentmods" width="80" height="20"></a>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.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00146 | $0.04019 |
| Opus 5 | $0.00073 | $0.02010 |
| Sonnet 5 | $0.00029 | $0.00804 |
| Haiku 4.5 | $0.00015 | $0.00402 |
Grade A, and why
pr-conflict-from-mid-flight-merges 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 6d 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.
How it starts
The opening of the file, as written. The whole thing — 240 lines — stays where its author put it; the contents beside it link to each section on GitHub.
PR Conflict from Mid-Flight Merges
Problem
You opened a PR, it was clean and mergeable. While reviewers/CI/you were elsewhere, other PRs landed on main that touched some of the same files. Your PR now shows mergeStateStatus: DIRTY / mergeable: CONFLICTING on GitHub, with a "This branch has conflicts that must be resolved" banner.
A naive git rebase origin/main may try to replay 14+ commits that aren't really yours — including commits that were squash-merged into main under different SHAs, or commits that someone else cherry-picked onto your branch. You need to (a) identify the actual delta, (b) drop redundant local commits before rebasing, and (c) reconcile any incidental cross-PR additions in a follow-up commit.
Context / Trigger Conditions
All four hold:
- PR was clean when opened or last pushed.
gh pr view N --json mergeable,mergeStateStatusnow returnsmergeable: "CONFLICTING"andmergeStateStatus: "DIRTY".git log --oneline $(git merge-base HEAD origin/main)..origin/mainshows ≥ 1 commit on main since your branch point.git diff --name-only $(git merge-base HEAD origin/main)..origin/mainshows files that overlap with your PR's changes.
Adjacent symptom that strengthens the diagnosis: git log --oneline HEAD~5..HEAD shows commits you don't recognize ("docs: changelog entry for v3.1.0..." when you only meant to add a README fix) — this means a sibling branch's work got pulled into your local feature branch via checkout-with-modified-state or someone else's cherry-pick.
Solution
Seven-step recipe. Run from the PR's local feature branch.
Step 1 — Confirm the conflict and capture the merge state
gh pr view <PR#> --json mergeable,mergeStateStatus,baseRefName,headRefName
Expect mergeable: "CONFLICTING", mergeStateStatus: "DIRTY". Note baseRefName (usually main) and headRefName (your feature branch).
Step 2 — Identify what landed on main since your branch point
git fetch origin main
git merge-base HEAD origin/main # branch point SHA
git log --oneline $(git merge-base HEAD origin/main)..origin/main # what they merged
git diff --name-only $(git merge-base HEAD origin/main)..origin/main # which files
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.
- 6d ago Changed · +7 lines 1641ab3bd03c
- 11d ago First seen · 233 lines · 146 tokens per session scan A 9207b93e68ad
pr-conflict-from-mid-flight-merges is a skill published in the GitHub repository wan-huiyan/agent-traffic-control (3 stars, last pushed 6d ago), licensed MIT. It adds 146 tokens to every session and 4,019 once invoked, about $0.0007 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.
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.
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…
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.
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.
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.
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.