resolve_conflict
Resolve a server-reported conflict between two active project-memory entries on the same topic by choosing one, keeping both, or merging them, with a required reason note.
Instructions
Resolve a conflict the server reported (two active entries on the same topic). Ask the user first unless the answer is clear from the conversation. entry_a is the older entry, entry_b the newer. a_supersedes_b / b_supersedes_a keep one; both_valid keeps both; merge replaces both with merged_entry. A note explaining the reason is required.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| note | Yes | ||
| project | Yes | Project slug (from list_projects) | |
| resolution | Yes | ||
| conflict_id | Yes | ||
| merged_entry | No |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
No arguments | |||