apply_conflict_resolution
Merge an approved conflict resolution into the document, subject to the same human approval policy as other merges.
Instructions
Apply (merge) a previously proposed and reviewed conflict resolution. Subject to the same approval policy as any other merge.
Tool call template
Replace each placeholder with a value matching the input schema. Only required parameters are included; add optional parameters as needed.
{
"id": 1,
"jsonrpc": "2.0",
"method": "tools/call",
"params": {
"arguments": {
"conflict_id": "<conflict_id>"
},
"name": "apply_conflict_resolution"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| conflict_id | Yes |