resolve-conflicts skillA
resolve-conflicts is agent-read markdown (skill) from fmind/dot: Resolve Git merge or rebase conflicts; preserve intent and verify the combined result..
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
# Resolve Conflicts Finish a stopped `git merge` or `git rebase` by understanding what each side meant, not by picking a side. Do not abort merely to hide a conflict; abort and report when the operation itself targets the wrong base or cannot safely continue. Never "take ours" unless history shows the incoming change is obsolete. Branch naming lives in [Git branch preparation](../git-worktree/SKILL.md); committing and pushing in [git-add-commit-push](../git-delivery/references/git-add-commit-push.md). ## Workflow 1. **Map the state**: identify which operation stopped, the current and incoming commits, and every conflicted file before editing. ```bash git status --short # UU both modified; AU, UA, DU, UD: added or deleted on one side git diff --name-only --diff-filter=U git rev-parse -q --verify MERGE_HEAD # merge only git rev-parse -q --verify REBASE_HEAD # rebase only ``` 1. **Read both intents**: inspect the three index stages and operation-specific history before touching a hunk. During a rebase, `ours` is the branch being rebased onto and `theirs` is the commit being replayed. ```bash …
Read the whole file at its exact version.
How to install
mdr add fmind/dot/resolve-conflicts@git:20260919.4491844mdr add fmind/dot/resolve-conflicts@sha256:4821ea6c5b69de15Pin 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.
[](https://markdownregistry.com/a/art_466lkhagsrxjbtz2)
0 badge views in 30 days
Versions
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260919.4491844 latest | 2026-09-19 | 4491844 | 4,181 B | A | view · diff |
| git:20260916.50d6810 | 2026-09-16 | 50d6810 | 4,307 B | A | view · diff |
| git:20260911.616be7a | 2026-09-11 | 616be7a | 4,344 B | A | view · diff |
| git:20260908.131d2e1 | 2026-09-08 | 131d2e1 | 4,338 B | A | view · diff |
| git:20260906.ede7325 | 2026-09-06 | ede7325 | 4,089 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 (4181 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
fmind/dot · 9 stars · license MIT · pushed 2026-09-24 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_466lkhagsrxjbtz2 GET https://markdownregistry.com/api/v1/resolve?ref=fmind/dot/resolve-conflicts GET https://markdownregistry.com/api/v1/blob/4821ea6c5b69de151b36a5afcc5f5b6bf52480b0e7a26fd65cfa105b1958a620
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.