memory_resolve
Resolve git conflicts in memory files by listing conflicted files or performing a field-level 3-way merge; semantic conflicts are reported, not auto-resolved.
Instructions
List git-conflicted memory files, or attempt a field-level 3-way merge of one. Semantic conflicts are reported, never auto-resolved. Run it when a git pull or merge leaves memory files conflicted; the merged file is written in place (undo with git if the merge is wrong). For PR review state rather than file conflicts, use memory_pr_status. (MCP server and the open-memex resolve CLI; the opencode native plugin does not expose this tool.)
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| target | No | Memory id or file path to resolve. Omit to list conflicts. |