This file is byte-identical to the first copy the registry indexed, one of 5 indexed copies. Same content hash, so the same checks give both the same grade.
fix-merge-conflicts from cursor/plugins is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
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:20260217.b21ab16, 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_5zlhqx4lwvumgof7
GET https://markdownregistry.com/api/v1/resolve?ref=cursor/plugins/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.
cursor/plugins · advisor/skills/advisor/SKILL.md · Advisor mode. Consult a stronger (or different) model at key checkpoints: before major decisions, when stuck on an…
cursor/plugins · agent-compatibility/skills/check-agent-compatibility/SKILL.md · Run the full repository compatibility pass: scanner score, startup path, validation loop, and docs reliability.
cursor/plugins · cli-for-agent/skills/cli-for-agents/SKILL.md · Designs or reviews CLIs so coding agents can run them reliably: non-interactive flags, layered --help with examples…
cursor/plugins · create-plugin/skills/create-plugin-scaffold/SKILL.md · Create a new Cursor plugin scaffold with a valid manifest, component directories, and marketplace wiring. Use when…
cursor/plugins · create-plugin/skills/review-plugin-submission/SKILL.md · Audit a Cursor plugin for marketplace readiness. Use when validating manifests, component metadata, discovery paths…
cursor/plugins · cursor-sdk/skills/cursor-sdk/SKILL.md · Guide users building apps, scripts, CI pipelines, or automations on top of the Cursor TypeScript SDK (`@cursor/sdk`)…
cursor/plugins · cursor-team-kit/skills/control-cli/SKILL.md · Build or adapt a local harness to drive, inspect, and profile an interactive CLI or TUI without external services. Use…
cursor/plugins · cursor-team-kit/skills/control-ui/SKILL.md · Build or adapt a local browser/CDP harness to drive and inspect a web, IDE, or Electron UI. Use for local UI…
