Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution.
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
# Fix merge conflicts
## Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
## Workflow
1. Detect all conflicting files from git status and conflict markers.
2. Resolve each conflict with minimal, correctness-first edits.
3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
4. Regenerate lockfiles with package manager tools instead of hand-editing.
5. Run compile, lint, and relevant tests.
6. Stage resolved files and summarize key decisions.
## Guardrails
- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.
## Output
- Files resolved
- Notable resolution choices
- Build/test outcome
The line at the top of this page pins the label git:20260907.09f3a50, 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.
GET https://markdownregistry.com/api/v1/artifacts/art_z6jyhomlfujivuws
GET https://markdownregistry.com/api/v1/resolve?ref=michael-denyer/pstack-claude/fix-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/738b251281b30fd33e3892d0679cf94249e9c9e29e1bed40bcdde4a6aca98a76
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.
michael-denyer/pstack-claude · plugins/pstack/skills/architect/SKILL.md · Sketch types, signatures, and module structure before code, then stay in the loop while implementation fills in. Use…
michael-denyer/pstack-claude · plugins/pstack/skills/arena/SKILL.md · Spawn N parallel candidates at the same task, pick a base, graft the strongest parts of the losers into it. Use for…
michael-denyer/pstack-claude · plugins/pstack/skills/automate-me/SKILL.md · Use for "automate me", "create/update/refresh my -mode skill", "turn/capture my preferences or working style into a…
michael-denyer/pstack-claude · plugins/pstack/skills/babysit/SKILL.md · Watch an open PR — fix failing CI, handle the straightforward review comments, and drive it to a mergeable state…
michael-denyer/pstack-claude · plugins/pstack/skills/benchmark-checklist/SKILL.md · Vet a perf measurement (limiter, tuning, limits, errors, repeatability, relevance, and whether the work happened)…
michael-denyer/pstack-claude · plugins/pstack/skills/blast-radius/SKILL.md · Find what a change could break somewhere else before it ships, beyond the diff, and prove the one fact it's safe…
michael-denyer/pstack-claude · plugins/pstack/skills/bro/SKILL.md · Restate the last message in plain human language, with no jargon. Use for /bro or when asked to say it plainly.
michael-denyer/pstack-claude · plugins/pstack/skills/correct/SKILL.md · Find the mistakes agents keep repeating in this repo and make each one impossible. Try architecture first, then types…
michael-denyer/pstack-claude · plugins/pstack/skills/create-formal-verification-skill/SKILL.md · Generate a project-local skill that formally verifies the code where a bug costs the most and tests reach the least, in…
michael-denyer/pstack-claude · plugins/pstack/skills/create-verification-skill/SKILL.md · Generate a project-local verification skill that drives your app the way a user does — any language, framework, or…
michael-denyer/pstack-claude · plugins/pstack/skills/figure-it-out/SKILL.md · Design an auditable playbook when no narrower one fits: a large migration, an ambitious multi-part change, or work a…
