resolve_conflict_tool
Mark a detected conflict as resolved by recording its ID and resolution details, helping engineering agents keep project knowledge consistent across sessions.
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 |
|---|---|---|---|
| actor | No | ||
| project | No | ||
| session | No | ||
| request_id | No | ||
| resolution | Yes | ||
| conflict_id | Yes | ||
| operation_id | No |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| result | Yes |