resolve-conflicts skillA
resolve-conflicts is agent-read markdown (skill) from max-sixty/tend: Resolves merge conflicts on configured-bot PRs and, when requested, upstream dependency-bot PRs..
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 max-sixty/tend/resolve-conflicts@git:20260905.bc72fa9mdr add max-sixty/tend/resolve-conflicts@sha256:3bac170c37c28e19Pin 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_b2kourctiwcs3ewa)
0 badge views in 30 days
Versions
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260905.bc72fa9 latest | 2026-09-05 | bc72fa9 | 4,148 B | A | view · diff |
| git:20260831.f61a955 | 2026-08-31 | f61a955 | 3,532 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 (4148 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
max-sixty/tend · 35 stars · license MIT · pushed 2026-09-06 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_b2kourctiwcs3ewa GET https://markdownregistry.com/api/v1/resolve?ref=max-sixty/tend/resolve-conflicts GET https://markdownregistry.com/api/v1/blob/3bac170c37c28e19b061a96c54f85332a65d3c8cbc822a6d33382bc253ca64f6