workflow-merge-conflicts SKILL.md skillA
workflow-merge-conflicts from kensaurus/cursor-kenji is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add kensaurus/cursor-kenji/workflow-merge-conflicts@git:20260923.68c095ePins git:20260923.68c095e in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- kensaurus/cursor-kenji
- Path
skills/workflow-merge-conflicts/SKILL.md- Versions recorded
- 4
- Latest version
- git:20260923.68c095e, committed Sep 23, 2026
- First version recorded
- Aug 4, 2026
- Size
- 3,044 bytes
- Repository stars
- 9
- License
- MIT
Resolve an in-progress merge or rebase conflict by tracing each side back to its intent. Use when "resolve the conflicts", "fix this merge", "the rebase is stuck", or a pull has left conflict markers in the tree.
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
# Resolving Merge Conflicts **Degree of freedom: MIXED.** Which intent wins `[HIGH freedom]`; inspect, never `--abort` unasked, and run real checks `[LOW freedom — run exactly]`. > Adapted from [mattpocock/skills](https://github.com/mattpocock/skills) (MIT). ## How to reason 1. **Identify** — operation (merge/rebase/cherry-pick) and conflicted files 2. **Intent** — why each side changed, from commits/PRs — not the markers 3. **Preserve** — both intents if possible; else the merge's stated goal 4. **Verify** — typecheck + tests + lint; then finish the operation ## Worked example > **Identify:** rebase of `fix/cart-sku` onto `main`; conflict in `src/lib/cart.ts`. > **Intent:** this branch treats missing SKU as invalid; main extracted `quoteCart` to a new file. > **Preserve:** keep the extraction and the missing-SKU branch — move the guard into `quoteCart`. > **Verify:** `pnpm typecheck && pnpm test` green; `git rebase --continue`; tree clean. ## Self-critique before reporting - **Intent, not text** — no "ours/theirs" from appearance alone - **No invented behavior** — resolution does not add a third design - **Checks run** — semantic conflicts caught after a clean text merge …
Read the whole file at its exact version.
How to install
mdr add kensaurus/cursor-kenji/workflow-merge-conflicts@sha256:17cffe3037094b1fThe line at the top of this page pins the label git:20260923.68c095e, 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_hwmtkqi656aa5x5d)
1 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 4 versions of this file, between Aug 4, 2026 and Sep 23, 2026, about one every 17 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260923.68c095e latest | 2026-09-23 | 68c095e | 3,044 B | A | view · diff |
| git:20260923.cf348bd | 2026-09-23 | cf348bd | 3,087 B | A | view · diff |
| git:20260821.2a41031 | 2026-08-21 | 2a41031 | 3,094 B | A | view · diff |
| git:20260804.fb32038 | 2026-08-04 | fb32038 | 1,747 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 (3044 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
kensaurus/cursor-kenji · 9 stars · license MIT · pushed 2026-10-19 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_hwmtkqi656aa5x5d GET https://markdownregistry.com/api/v1/resolve?ref=kensaurus/cursor-kenji/workflow-merge-conflicts GET https://markdownregistry.com/api/v1/blob/17cffe3037094b1fc046560f3c2115d4b620f8478308ac77493ac4e3ebebd01b
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 kensaurus/cursor-kenji
Every file in kensaurus/cursor-kenji