diff-each-side-against-merge-base SKILL.md skillA
diff-each-side-against-merge-base from iamakbarsha1/whetstone is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add iamakbarsha1/whetstone/diff-each-side-against-merge-base@git:20261019.5842640Pins git:20261019.5842640 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- iamakbarsha1/whetstone
- Path
skills/diff-each-side-against-merge-base/SKILL.md- Versions recorded
- 5
- Latest version
- git:20261019.5842640, committed Oct 19, 2026
- First version recorded
- Aug 9, 2026
- Size
- 5,059 bytes
- Repository stars
- 4
- License
- CC-BY-4.0
Use when resolving a merge or rebase conflict, or reviewing a merge commit — conflict markers show where git gave up, not the full semantic delta, and 3-way auto-merge silently drops fields outside the markers. Compare ours/theirs/base by symbol and field inventory before trusting the result. Triggers on "merge conflict", "resolve conflict", "rebase", "git merge", "auto-merge", "cherry-pick", and reviewing a large merge diff.
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
# Diff Each Side Against the Merge Base **Type:** Open-source — client-agnostic methodology, no project-specific detail. **Created by akbarsha — https://github.com/iamakbarsha1** Distilled from a case where 3-way auto-merge silently dropped fields outside the conflict markers, and reading only the marked regions would have shipped a file missing content. **Licence:** Released under CC BY 4.0 — share and adapt for any purpose with credit. Full text: `LICENSE` at the repository root. **Feedback & Support:** If a rule here proves wrong or needs sharpening, open an issue on the repository or contact the author at the profile link above. If the problem is the agent not following a rule below rather than the rule itself, that's an execution failure — acknowledge and correct it. ## The core rule Conflict markers mark where git could not decide — not the full extent of what changed. Git's 3-way merge auto-resolves every hunk it thinks is unambiguous, and those silent auto-resolutions can drop or duplicate content when both sides edited near the same region. Resolving a conflict by reading ONLY the `<<<<<<<`/`>>>>>>>` regions is resolving a fraction of the delta. For any …
Read the whole file at its exact version.
How to install
mdr add iamakbarsha1/whetstone/diff-each-side-against-merge-base@sha256:cb169959b3424f3aThe line at the top of this page pins the label git:20261019.5842640, 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_hsarnmr2u3sn75xn)
1 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Aug 9, 2026 and Oct 19, 2026, about one every 18 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261019.5842640 latest | 2026-10-19 | 5842640 | 5,059 B | A | view · diff |
| git:20261019.b3a119b | 2026-10-19 | b3a119b | 4,889 B | A | view · diff |
| git:20260815.0363531 | 2026-08-15 | 0363531 | 4,074 B | A | view · diff |
| git:20260815.61aa8b5 | 2026-08-15 | 61aa8b5 | 4,046 B | A | view · diff |
| git:20260809.e9e787b | 2026-08-09 | e9e787b | 3,600 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 (5059 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
iamakbarsha1/whetstone · 4 stars · license CC-BY-4.0 · pushed 2026-10-24 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_hsarnmr2u3sn75xn GET https://markdownregistry.com/api/v1/resolve?ref=iamakbarsha1/whetstone/diff-each-side-against-merge-base GET https://markdownregistry.com/api/v1/blob/cb169959b3424f3a957a5679628935527bef1f601cb3ed7510dbf441ba312e58
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.