resolve-conflicts SKILL.md skillA
resolve-conflicts from max-sixty/tend is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add max-sixty/tend/resolve-conflicts@git:20260924.b3c4ba6Pins git:20260924.b3c4ba6 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- max-sixty/tend
- Path
plugins/tend-ci-runner/skills/resolve-conflicts/SKILL.md- Versions recorded
- 10
- Latest version
- git:20260924.b3c4ba6, committed Sep 24, 2026
- First version recorded
- Aug 31, 2026
- Size
- 4,496 bytes
- Repository stars
- 42
- License
- MIT
Resolves merge conflicts on configured-bot PRs and, when requested, upstream dependency-bot PRs.
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
# Resolve Conflicts Resolve configured-bot PRs. Include Dependabot and Renovate only when the calling skill requests dependency bots. ## Required skills - Load `/tend-ci-runner:run-tend` before acting. - Load `/tend-ci-runner:push-commits` before pushing a resolution and `/tend-ci-runner:post-to-github` before composing a deferral comment. - Load `/tend-ci-runner:monitor-ci` after pushing a conflict resolution. ## Find conflicts List up to 100 open PRs per author, including the head and base names and SHAs. Test each PR locally against its own base; GitHub's `mergeable` field can remain `UNKNOWN` while it computes. ```bash git fetch --quiet --force origin \ "refs/heads/<base>:refs/tend/base/<number>" \ "refs/pull/<number>/head:refs/tend/pr/<number>" git merge-tree --write-tree \ "refs/tend/base/<number>" "refs/tend/pr/<number>" >/dev/null ``` Treat a failed query or fetch as unverified, not clean. Remove any prior conflict-deferral comment from any PR this skill handles that test-merges clean. When called from `notifications`, use every issue-comment page and skip a PR whose bot-authored marker names the live `headRefOid`. Nightly ignores the marker and retries. …
Read the whole file at its exact version.
How to install
mdr add max-sixty/tend/resolve-conflicts@sha256:e017e7b5ccf9f50eThe line at the top of this page pins the label git:20260924.b3c4ba6, 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_b2kourctiwcs3ewa)
3 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 10 versions of this file, between Aug 31, 2026 and Sep 24, 2026, about one every 3 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260924.b3c4ba6 latest | 2026-09-24 | b3c4ba6 | 4,496 B | A | view · diff |
| git:20260918.1ca04b2 | 2026-09-18 | 1ca04b2 | 4,253 B | A | view · diff |
| git:20260917.098d345 | 2026-09-17 | 098d345 | 4,296 B | A | view · diff |
| git:20260917.e623d1a | 2026-09-17 | e623d1a | 4,297 B | A | view · diff |
| git:20260916.57a020f | 2026-09-16 | 57a020f | 4,295 B | A | view · diff |
| git:20260914.1b1db62 | 2026-09-14 | 1b1db62 | 4,348 B | A | view · diff |
| git:20260912.a020b7c | 2026-09-12 | a020b7c | 4,179 B | A | view · diff |
| git:20260909.94a512d | 2026-09-09 | 94a512d | 4,151 B | A | view · diff |
| git:20260905.bc72fa9 | 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 (4496 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 · 42 stars · license MIT · pushed 2026-11-03 · 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/e017e7b5ccf9f50ecb2b6d8c71dda90fb55ac90265e66996572391c8b4cd399a
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.