resolve_conflict
Resolve a contradiction between two notes by keeping the older, keeping the newer, or keeping both with a reconciliation note. Records each resolution as a git commit without deleting anything.
Instructions
Resolve a contradiction between two notes (ids from a remember WARNING, or the Conflicts page). Only do this when the user has told you which side is right; if unsure, ask them. a is the older note, b the newer. Actions: keep_a (b is marked superseded), keep_b (a is marked superseded), or keep_both (requires note, a reconciliation explaining how both hold; both stay active). Each resolution is exactly one git commit. Nothing is deleted.
Tool call template
Replace each placeholder with a value matching the input schema. Only required parameters are included; add optional parameters as needed.
{
"id": 1,
"jsonrpc": "2.0",
"method": "tools/call",
"params": {
"arguments": {
"a": "<a>",
"b": "<b>",
"action": "<action>"
},
"name": "resolve_conflict"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| a | Yes | Id of the first (older) note. | |
| b | Yes | Id of the second (newer) note. | |
| why | No | Why this resolution (recorded as provenance). | |
| note | No | Reconciliation text; required for keep_both. | |
| action | Yes |