fix-merge-conflicts is agent-read markdown (skill) from asymmetric-al/core: Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution.
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.
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
Pin 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.
GET https://markdownregistry.com/api/v1/artifacts/art_ynowga7ddj2vhkxs
GET https://markdownregistry.com/api/v1/resolve?ref=asymmetric-al/core/fix-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/738b251281b30fd33e3892d0679cf94249e9c9e29e1bed40bcdde4a6aca98a76
Your agent 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.
asymmetric-al/core · .agents/skills/accessibility-review/SKILL.md · Audit and fix accessibility in Core UI. Use when changing or reviewing buttons, links, forms, validation, dialogs…
asymmetric-al/core · .agents/skills/agent-browser/SKILL.md · Browser automation CLI for AI agents. Use when the user needs to interact with websites, including navigating pages…
asymmetric-al/core · .agents/skills/agent-email-inbox/SKILL.md · Use when building any system where email content triggers actions — AI agent inboxes, automated support handlers…
asymmetric-al/core · .agents/skills/anim/SKILL.md · Tasteful, subtle web UI animation following Emil Kowalski / animations.dev principles. Use when adding or reviewing…
asymmetric-al/core · .agents/skills/animation-vocabulary/SKILL.md · Reverse-lookup glossary that turns a vague description of a web animation or motion effect into its exact term ("the…
asymmetric-al/core · .agents/skills/api-design-principles/SKILL.md · Master REST and GraphQL API design principles to build intuitive, scalable, and maintainable APIs that delight…
asymmetric-al/core · .agents/skills/apple-design/SKILL.md · Apple's approach to interface design and fluid, physical motion, translated for the web. Use when building or reviewing…
asymmetric-al/core · .agents/skills/babysit/SKILL.md · Orchestrate via @babysitter. Use this skill when asked to babysit a run, orchestrate a process or whenever it is called…
asymmetric-al/core · .agents/skills/base-ui/SKILL.md · Build accessible, composable UI with @base-ui/react primitives and project styling tokens. Use when creating or…
asymmetric-al/core · .agents/skills/bats-testing-patterns/SKILL.md · Master Bash Automated Testing System (Bats) for comprehensive shell script testing. Use when writing tests for shell…
