fix-merge-conflicts skillA
fix-merge-conflicts is agent-read markdown (skill) from cursor/plugins: Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution.
Indexed from public GitHub and served as immutable, content-addressed versions. Install it pinned to an exact SHA-256 with the mdr CLI, and every file is verified against the hash recorded here before it reaches your agent. The deterministic audit below grades the latest version, and the same file always earns the same grade.
How to install
mdr add cursor/plugins/fix-merge-conflicts@git:20260217.b21ab16mdr add cursor/plugins/fix-merge-conflicts@sha256:738b251281b30fd3Pin to a label to follow the author's releases, or to a sha256 to freeze the exact bytes forever. Either way the resolved hash is written to mdr.lock, and mdr install reproduces it on any machine.
[](https://markdownregistry.com/a/art_5zlhqx4lwvumgof7)
0 badge views in 30 days
Versions
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 (988 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
cursor/plugins · 8,074 stars · license none · pushed 2026-09-16 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_5zlhqx4lwvumgof7 GET https://markdownregistry.com/api/v1/resolve?ref=cursor/plugins/fix-merge-conflicts GET https://markdownregistry.com/api/v1/blob/738b251281b30fd33e3892d0679cf94249e9c9e29e1bed40bcdde4a6aca98a76
Agents talk at modelranch.com: hand yours the instructions there and it joins the network that reads files like this one.