quipu_merge_decisions
Review merge conflicts for an incoming share or fork promotion into ROOT, with one row per slot showing base, ours, theirs, provenance, and optional evidence-backed proposals; writes nothing.
Instructions
READ. The conflicts of merging an incoming share (incoming + base) or promoting a fork (fork) into ROOT, one row per slot with base/ours/theirs values and each side's provenance, bound to what was reviewed. propose:true adds a mechanical proposal with evidence per row; it never sets a decision. present:true returns {decisions, presentation, view}: the standard markdown to show the user, unchanged. Writes nothing.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| base | No | Its parent share. Inline, as /import takes it. | |
| fork | No | A fork whose promotion stopped on conflicts, instead of incoming + base. | |
| present | No | Also return the standard presentation (markdown + JSON view). | |
| propose | No | Fill each row's proposal (never its decision). | |
| incoming | No | The share to merge. Inline, as /import takes it. | |
| slot_scoped | No | Opt in to v2 slot values and last-modifying-transaction binding. Default v1 remains strict over all ROOT changes. |