resolve_conflict_tool
Resolve a detected conflict by submitting its ID and a description of the chosen resolution, keeping persistent knowledge consistent.
Instructions
Mark a conflict as resolved.
Args: conflict_id: The conflict ID resolution: Description of how the conflict was resolved (e.g. 'Kept existing: X') project: Optional project root path. Auto-detected from git root if omitted.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| project | No | ||
| resolution | Yes | ||
| conflict_id | Yes |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| result | Yes |