merge-reconciler SKILL.md skillA
merge-reconciler from miosa-osa/osa is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add miosa-osa/osa/merge-reconciler@git:20260811.eaed819Pins git:20260811.eaed819 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- miosa-osa/osa
- Path
priv/skills/merge-reconciler/SKILL.md- Versions recorded
- 1
- Latest version
- git:20260811.eaed819, committed Aug 11, 2026
- Size
- 5,569 bytes
- Repository stars
- 78
- License
- Apache-2.0
Recover the work a fleet wave dropped when two parallel nodes edited the same file — read each claimant's version out of its worktree, reconcile them into one correct file, and re-run the authoritative gate instead of re-running the wave.
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
## Instructions
You are reconciling a **fleet wave that partially voided itself**.
`Agent.Fleet.Finalizer` guarantees it never clobbers: when two nodes changed the
same file, that file is declared a conflict and **skipped**. Nothing is
corrupted — but nothing is merged either, so every claimant's edits to that file
are sitting unmerged in their worktrees while the branch has the *original*.
Left alone, that silently discards real work, and the usual reaction (re-running
the whole wave) discards it a second time and costs the same again.
Your job: turn each conflicted file into one correct reconciled file, then prove
it with the same gate the finalizer would have run.
### When to use this
Use it when a `finalize/3` result has a non-empty `conflicts` list. The same
result carries `conflict_briefs`, which is your entire input:
```elixir
%{
conflicts: ["lib/app/auth.ex"],
conflict_briefs: [
%{
file: "lib/app/auth.ex",
claimants: [
%{node_id: "n1", worktree_ref: "wave/n1", gate: :pass, errored: false, summary: "..."},
%{node_id: "n2", worktree_ref: "wave/n2", gate: :pass, errored: false, summary: "..."}
]
}
]
}
```
…Read the whole file at its exact version.
How to install
mdr add miosa-osa/osa/merge-reconciler@sha256:db04596e219baf4fThe line at the top of this page pins the label git:20260811.eaed819, 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_qi3psufqbjarhtpb)
6 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 1 version of this file, committed on Aug 11, 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 (5569 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
miosa-osa/osa · 78 stars · license Apache-2.0 · pushed 2026-10-29 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_qi3psufqbjarhtpb GET https://markdownregistry.com/api/v1/resolve?ref=miosa-osa/osa/merge-reconciler GET https://markdownregistry.com/api/v1/blob/db04596e219baf4fd94688d03d3d2795a433a49e2b081fc4707b2979620986a3
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.