workflow-merge-conflicts SKILL.md skillA
workflow-merge-conflicts from kensaurus/skills is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add kensaurus/skills/workflow-merge-conflicts@git:20261019.95c89e5Pins git:20261019.95c89e5 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- kensaurus/skills
- Path
skills/workflow-merge-conflicts/SKILL.md- Versions recorded
- 5
- Latest version
- git:20261019.95c89e5, committed Oct 19, 2026
- First version recorded
- Aug 4, 2026
- Size
- 3,454 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). Copy this checklist and tick items as you go: ``` - [ ] Step 1: See the current state: operation and conflicting files - [ ] Step 2: Find the primary sources for each conflict; read the intent - [ ] Step 3: Resolve each hunk; keep both intents; never --abort unasked - [ ] Step 4: Run the project's automated checks: typecheck, tests, lint - [ ] Step 5: Finish the operation; tree clean and checks green ``` ## 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. …
Read the whole file at its exact version.
How to install
mdr add kensaurus/skills/workflow-merge-conflicts@sha256:71dc09433dfa92cfThe line at the top of this page pins the label git:20261019.95c89e5, 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_lv4sxobpr2wyu73f)
1 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Aug 4, 2026 and Oct 19, 2026, about one every 19 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261019.95c89e5 latest | 2026-10-19 | 95c89e5 | 3,454 B | A | view · diff |
| git:20260923.68c095e | 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 (3454 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/skills · 9 stars · license MIT · pushed 2026-10-19 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_lv4sxobpr2wyu73f GET https://markdownregistry.com/api/v1/resolve?ref=kensaurus/skills/workflow-merge-conflicts GET https://markdownregistry.com/api/v1/blob/71dc09433dfa92cf745e86eef111a6d1c848c43cb100e79f22f7705d863ef665
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/skills
Every file in kensaurus/skills