merge-conflicts SKILL.md skillA
merge-conflicts from event4u-app/agent-config is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add event4u-app/agent-config/merge-conflicts@git:20261007.b83bcb1Pins git:20261007.b83bcb1 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- event4u-app/agent-config
- Path
src/skills/merge-conflicts/SKILL.md- Versions recorded
- 7
- Latest version
- git:20261007.b83bcb1, committed Oct 7, 2026
- First version recorded
- Jul 13, 2026
- Size
- 10,878 bytes
- Repository stars
- 19
- License
- MIT
Use when the user has merge conflicts or says "resolve conflicts". Understands conflict markers, resolution strategies, and verification workflow.
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-conflicts ## When to use Use this skill when: - A merge or rebase produces conflicts - The user asks to "resolve conflicts", "fix merge", or "update branch" - CI fails because the branch is behind main - The `prepare-for-review` command encounters conflicts ## Procedure: Resolve merge conflicts ### 0. Classify before resolving — and never start in the GitHub web editor A `CONFLICTING` PR is not a signal to open the web editor. **The web editor cannot tell generated from authored**, so it presents a mechanical regeneration and a real human decision as the same three-way merge — which is how a generated file gets hand-merged into a state matching neither branch. So classify locally first, before resolving anything. Sort every conflicted path into three classes, because the correct resolution differs per class and only one of them is a judgement call: | Class | What it is | Resolution | |---|---|---| …
Read the whole file at its exact version.
How to install
mdr add event4u-app/agent-config/merge-conflicts@sha256:d058fcd0ceab9801The line at the top of this page pins the label git:20261007.b83bcb1, 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_ne6wvqev5nzikxsy)
6 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 7 versions of this file, between Jul 13, 2026 and Oct 7, 2026, about one every 14 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261007.b83bcb1 latest | 2026-10-07 | b83bcb1 | 10,878 B | A | view · diff |
| git:20261007.0f9c32e | 2026-10-07 | 0f9c32e | 10,561 B | A | view · diff |
| git:20260821.271f72d | 2026-08-21 | 271f72d | 10,343 B | A | view · diff |
| git:20260821.2dbb781 | 2026-08-21 | 2dbb781 | 10,341 B | A | view · diff |
| git:20260821.6246dea | 2026-08-21 | 6246dea | 9,895 B | A | view · diff |
| git:20260816.1bf6a9a | 2026-08-16 | 1bf6a9a | 8,552 B | A | view · diff |
| git:20260713.3f51f4e | 2026-07-13 | 3f51f4e | 8,451 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 (10878 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
event4u-app/agent-config · 19 stars · license MIT · pushed 2026-11-05 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_ne6wvqev5nzikxsy GET https://markdownregistry.com/api/v1/resolve?ref=event4u-app/agent-config/merge-conflicts GET https://markdownregistry.com/api/v1/blob/d058fcd0ceab98011b3df3cb06e3044e77bbe8faae47f89de6327009ff7e6abf
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.