resolve-pr-conflicts SKILL.md skillA
resolve-pr-conflicts from tomzx/agents is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add tomzx/agents/resolve-pr-conflicts@git:20261007.b35fc4bPins git:20261007.b35fc4b in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- tomzx/agents
- Path
skills/resolve-pr-conflicts/SKILL.md- Versions recorded
- 5
- Latest version
- git:20261007.b35fc4b, committed Oct 7, 2026
- First version recorded
- Sep 13, 2026
- Size
- 17,094 bytes
- Repository stars
- 12
- License
- MIT
Scan a repository for the current user's open pull requests that have merge conflicts, then resolve each one IN PARALLEL by fanning out to a separate agent session per PR. Each session reuses an existing git worktree or creates a new one, fixes the conflicts, verifies, and pushes. Use when the user says /resolve-pr-conflicts, "fix merge conflicts", "resolve PR conflicts", "my PRs have conflicts", "unblock my PRs", or wants to bulk-resolve merge conflicts on their own pull requests in parallel.
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 PR Conflicts Finds every open pull request authored by the current user in a repository that has merge conflicts, then resolves each one **in parallel**. The skill is split into two roles: - **Orchestrator (this session):** scans the repo, detects which of the user's PRs have conflicts, prepares one worktree per conflicting PR (reusing an existing one when present), discovers the project's verification commands once, then fans out to one sub-agent session per PR and aggregates the results. - **Sub-agent (one per PR, concurrent):** works inside its assigned worktree, merges the base branch, resolves the conflict markers, runs verification, pushes, and posts a comment. Because the PRs are independent, fixing them in separate concurrent sessions is much faster than sequential resolution. Each sub-agent owns a distinct worktree and a distinct head branch, so there are no filesystem or git-push races. Designed to be safe to run unattended: ambiguous conflicts and PRs that fail verification are aborted and reported by that PR's sub-agent, never pushed. ## Prerequisites - Apply the shared SDLC conventions in `skills/sdlc/references/shared.md`. …
Read the whole file at its exact version.
How to install
mdr add tomzx/agents/resolve-pr-conflicts@sha256:ef9f72dd21e1107bThe line at the top of this page pins the label git:20261007.b35fc4b, 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_mapfrddkclwftg7c)
1 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Sep 13, 2026 and Oct 7, 2026, about one every 6 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261007.b35fc4b latest | 2026-10-07 | b35fc4b | 17,094 B | A | view · diff |
| git:20261004.00bb0c5 | 2026-10-04 | 00bb0c5 | 17,070 B | A | view · diff |
| git:20261002.777260f | 2026-10-02 | 777260f | 17,065 B | A | view · diff |
| git:20260930.e2e20d7 | 2026-09-30 | e2e20d7 | 17,018 B | A | view · diff |
| git:20260913.c0fdecb | 2026-09-13 | c0fdecb | 16,822 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 (17094 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
tomzx/agents · 12 stars · license MIT · pushed 2026-10-21 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_mapfrddkclwftg7c GET https://markdownregistry.com/api/v1/resolve?ref=tomzx/agents/resolve-pr-conflicts GET https://markdownregistry.com/api/v1/blob/ef9f72dd21e1107bb6fafab24a3496457934ea8be9590f1fc12b07378e3cd1b5
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.