fix-merge-conflicts SKILL.md skillA
This file is byte-identical to the first copy the registry indexed. Same content hash, so the same checks give both the same grade.
fix-merge-conflicts from ulises-jeremias/agent-toolkit is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add ulises-jeremias/agent-toolkit/fix-merge-conflicts@git:20260831.856ee57Pins git:20260831.856ee57 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- ulises-jeremias/agent-toolkit
- Path
plugins/agent-toolkit-complete/.opencode/skills/fix-merge-conflicts/SKILL.md- Versions recorded
- 1
- Latest version
- git:20260831.856ee57, committed Aug 31, 2026
- Size
- 4,102 bytes
- Repository stars
- 19
- License
- MIT
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 Resolve merge conflicts non-interactively and return the branch to a buildable state. ## When to use - `git status` shows `Unmerged paths` or `CONFLICT`, or the branch reports merge conflicts against `main`. - User asks to "fix merge conflicts", "resolve conflicts", "rebase and fix", or "make this branch mergeable". - A PR is blocked by conflicts after pulling main. ## Prerequisites - Inside a Git repository with write access (`git status` works). - Conflicts come from a merge or rebase (e.g. `git merge main`, `git pull --rebase`, `gh pr update-branch`). - Toolchain available for validation: package manager (`npm`/`yarn`/`pnpm`/`bun`/`uv`/`cargo`/etc.) and `git`. ## Workflow 1. **Detect conflicts.** Run `git status --porcelain` and scan for `UU`/`AA`/`DD`/`U*` markers. Confirm with `grep -r "<<<<<<< " --include="*.md" --include="*.ts" --include="*.js" --include="*.py" --include="*.v" --include="*.yaml" --include="*.json" -l` (and `git diff --check` for leftover markers). List every conflicting file. …
Read the whole file at its exact version.
How to install
mdr add ulises-jeremias/agent-toolkit/fix-merge-conflicts@sha256:ada35e42bf199b79The line at the top of this page pins the label git:20260831.856ee57, 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_7xcxuskj6b4p2zak)
5 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 1 version of this file, committed on Aug 31, 2026.
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 (4102 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
ulises-jeremias/agent-toolkit · 19 stars · license MIT · pushed 2026-10-21 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_7xcxuskj6b4p2zak GET https://markdownregistry.com/api/v1/resolve?ref=ulises-jeremias/agent-toolkit/fix-merge-conflicts GET https://markdownregistry.com/api/v1/blob/ada35e42bf199b79015790893b93905dfccc3952a206d916ccd45b4750f21b2e
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.
More from ulises-jeremias/agent-toolkit
Every file in ulises-jeremias/agent-toolkit