Resolve GitOps conflict
resolve_gitops_conflictResolve one GitOps merge conflict by picking the winning side. resolution 'git' keeps Git's version (the cluster record is updated to match Git); resolution 'cluster' keeps the cluster's version (it is pushed back to Git). The choice is recorded on the conflict and applied on the next sync, which converges both sides and clears the conflict. The losing side's content is overwritten, so inspect the diff with get_gitops_conflict_diff and state which side you recommend before calling this.
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": {
"resource_key": "<resource_key>",
"resolution": "<resolution>"
},
"name": "resolve_gitops_conflict"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| cluster_id | No | Cluster UUID. Optional when the chat is already scoped to a cluster. | |
| resolution | Yes | Which side wins: 'git' or 'cluster'. | |
| resource_key | Yes | The conflict's resource key, e.g. stack:platform/addon:nginx. |