merge-conflict-generated-files SKILL.md skillA
merge-conflict-generated-files 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/merge-conflict-generated-files@v1.1.1Pins v1.1.1 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/merge-conflict-generated-files/SKILL.md- Versions recorded
- 6
- Latest version
- v1.1.1, committed Sep 17, 2026
- First version recorded
- Aug 10, 2026
- Size
- 13,200 bytes
- Repository stars
- 3
- License
- MIT
The conflicting files are derived output from a generator: resolve their source, re-run it and stage the fresh result rather than hand merging the output.
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
# Merge Conflict in Generated Output Files ## Problem A project generates output files (HTML, JSON, CSS, TypeScript declarations, OpenAPI specs, etc.) from a source-of-truth input. Both branches modified the source AND committed fresh generated outputs. The merge/rebase now shows conflicts in the generated files — but hand- merging them is both futile (the generator will overwrite them) and error-prone (computed totals, sorted indexes, and aggregated summaries can't be correctly resolved by text diffing). **The key mistake to avoid:** treating generated file conflicts as real conflicts requiring line-by-line resolution. They're not — they're a side effect of forgetting that the files are derived. ## Context / Trigger Conditions Apply this skill when ALL of these hold: 1. Multiple files are in the conflict set, but most of them look like generated output (HTML tables, JSON indexes, minified CSS, declaration files, changelogs built from commits). 2. You can identify a single source generator that produces them — a build command, a Python script, `make docs`, `npm run build`, `openapi-generator`, etc. …
Read the whole file at its exact version.
How to install
mdr add wan-huiyan/agent-traffic-control/merge-conflict-generated-files@sha256:fbd7c8f5c86d230fThe line at the top of this page pins the label v1.1.1, 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_fp7rrmnulnbop3iq)
2 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 6 versions of this file, between Aug 10, 2026 and Sep 17, 2026, about one every 8 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| v1.1.1 latest | 2026-09-17 | e5ca372 | 13,200 B | A | view · diff |
| v1.1.0 | 2026-09-12 | aec1aa9 | 12,935 B | A | view · diff |
| v1.1.0 | 2026-08-12 | 9a8e5a8 | 12,997 B | A | view · diff |
| v1.1.0 | 2026-08-11 | f274e4b | 12,918 B | A | view · diff |
| v1.1.0 | 2026-08-10 | 5b6d8a2 | 12,912 B | A | view · diff |
| v1.1.0 | 2026-08-10 | a58c34c | 12,889 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 (13200 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_fp7rrmnulnbop3iq GET https://markdownregistry.com/api/v1/resolve?ref=wan-huiyan/agent-traffic-control/merge-conflict-generated-files GET https://markdownregistry.com/api/v1/blob/fbd7c8f5c86d230ffd5b4fa98b07810d8402c1584f2aec2db1fc6fd550abfb01
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.