pr-conflict-from-mid-flight-merges SKILL.md skillA
pr-conflict-from-mid-flight-merges from wan-huiyan/agent-traffic-control is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add wan-huiyan/agent-traffic-control/pr-conflict-from-mid-flight-merges@v1.1.2Pins v1.1.2 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- wan-huiyan/agent-traffic-control
- Path
plugins/agent-traffic-control/skills/pr-conflict-from-mid-flight-merges/SKILL.md- Versions recorded
- 8
- Latest version
- v1.1.2, committed Sep 22, 2026
- First version recorded
- Aug 10, 2026
- Size
- 17,075 bytes
- Repository stars
- 3
- License
- MIT
A pull request that was clean when you opened it now says on GitHub "This branch has conflicts that must be resolved", because others landed on main over the days it sat open. Use when `gh pr view N --json mergeable,mergeStateStatus` returns CONFLICTING and DIRTY, when your branch carries commits you do not recognise, or when some of yours are already on main under a different sha from a squash merge. Find which landed and which of yours are redundant, then reset to the origin tip, rebase and…
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
# 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: 1. PR was clean when opened or last pushed. 2. `gh pr view N --json mergeable,mergeStateStatus` now returns `mergeable: "CONFLICTING"` and `mergeStateStatus: "DIRTY"`. 3. `git log --oneline $(git merge-base HEAD origin/main)..origin/main` shows ≥ 1 commit on main since your branch point. …
Read the whole file at its exact version.
How to install
mdr add wan-huiyan/agent-traffic-control/pr-conflict-from-mid-flight-merges@sha256:ce4afa72df1b06cfThe line at the top of this page pins the label v1.1.2, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
[](https://markdownregistry.com/a/art_zvlij3olamqm3ksp)
2 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 8 versions of this file, between Aug 10, 2026 and Sep 22, 2026, about one every 6 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| v1.1.2 latest | 2026-09-22 | 05de8be | 17,075 B | A | view · diff |
| v1.1.2 | 2026-09-22 | aa6e5b5 | 16,932 B | A | view · diff |
| v1.1.2 | 2026-09-17 | e5ca372 | 16,532 B | A | view · diff |
| v1.1.1 | 2026-09-11 | 2d7d978 | 16,246 B | A | view · diff |
| v1.1.0 | 2026-09-02 | e4a8810 | 15,998 B | A | view · diff |
| v1.1.0 | 2026-08-10 | 5b6d8a2 | 15,227 B | A | view · diff |
| v1.1.0 | 2026-08-10 | a58c34c | 15,208 B | A | view · diff |
| v1.1.0 | 2026-08-10 | a39e221 | 15,661 B | A | view |
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (17075 bytes)
- pass: No zero-width or bidi control characters
- pass: No instruction hidden inside an HTML comment
- pass: No link to an exfiltration or paste host
- pass: No credential-shaped string
- pass: No instruction to send local credentials anywhere
- pass: No text hidden with inline styles
- pass: No prompt-injection phrasing
- pass: No curl or wget piped into a shell
- pass: No recursive delete of root, home or parent
- pass: No instruction to read or print local credentials
- pass: No base64 blob over 200 characters
- pass: No link to a raw IP address
- pass: No script tag
Source
wan-huiyan/agent-traffic-control · 3 stars · license MIT · pushed 2026-09-22 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_zvlij3olamqm3ksp GET https://markdownregistry.com/api/v1/resolve?ref=wan-huiyan/agent-traffic-control/pr-conflict-from-mid-flight-merges GET https://markdownregistry.com/api/v1/blob/ce4afa72df1b06cff69bc2ccb98d5fa7ad3f290da0062c4f46b58933aeca4a7b
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.