mind_merge
Merge a branch into a target using a three-way merge from their common ancestor. Resolve conflicts by providing resolutions for changed memories.
Instructions
Merge understanding: fold a branch into a target (default main) with a three-way merge from their common ancestor.
Memories only one side touched merge automatically; links merge set-wise. If both sides changed the same memory the call fails with the conflict list (each has base/ours/theirs snapshots and hunks) — resolve by calling again with resolutions like [{"memory_id": "...", "resolution": "theirs"}] or [{"memory_id": "...", "resolution": {"title": "...", "content": "..."}}] for a hand-merged version. Relay conflicts to the user when the choice isn't obvious.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| source | Yes | Branch to merge from. | |
| target | No | Branch to merge into (default "main"). | main |
| message | No | Optional merge-commit message. | |
| resolutions | No | Conflict resolutions from a previous attempt. |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
No arguments | |||