Skip to main content
Glama

Resolve GitOps conflict

resolve_gitops_conflict
Destructive

Resolve 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

NameRequiredDescriptionDefault
cluster_idNoCluster UUID. Optional when the chat is already scoped to a cluster.
resolutionYesWhich side wins: 'git' or 'cluster'.
resource_keyYesThe conflict's resource key, e.g. stack:platform/addon:nginx.

Schema Changelog

Changes observed during successful MCP inspections.

  1. First observed

TDQS

A4.7/5.0
Behavior4/5

Does the description disclose side effects, auth requirements, rate limits, or destructive behavior?

Annotations already declare destructiveHint=true and idempotentHint=false, but the description adds real context beyond them: exactly what is destroyed ('the losing side's content is overwritten'), that the effect is deferred ('applied on the next sync'), and the resulting convergence. It does not state permission requirements or how to verify the sync succeeded, which keeps it just short of a 5.

Agents need to know what a tool does to the world before calling it. Descriptions should go beyond structured annotations to explain consequences.

Conciseness5/5

Is the description appropriately sized, front-loaded, and free of redundancy?

Four sentences, front-loaded with the action and its decision axis, then consequences, then the safety prerequisite. There is no filler and no repetition of the annotations or schema.

Shorter descriptions cost fewer tokens and are easier for agents to parse. Every sentence should earn its place.

Completeness5/5

Given the tool's complexity, does the description cover enough for an agent to succeed on first attempt?

For a destructive, non-idempotent mutation with three simple parameters and no output schema, the agent gets the action, both resolution outcomes, timing of the effect, data-loss warning, and the required pre-check. Nothing essential to calling it correctly is missing.

Complex tools with many parameters or behaviors need more documentation. Simple tools need less. This dimension scales expectations accordingly.

Parameters4/5

Does the description clarify parameter syntax, constraints, interactions, or defaults beyond what the schema provides?

Schema coverage is 100%, so the baseline is 3, but the description goes further by explaining the consequence of each enum value — 'git' updates the cluster record to match Git, 'cluster' pushes the cluster version back to Git. That is meaningful semantics the enum labels alone do not convey. resource_key format and the optional cluster_id are left entirely to the schema.

Input schemas describe structure but not intent. Descriptions should explain non-obvious parameter relationships and valid value ranges.

Purpose5/5

Does the description clearly state what the tool does and how it differs from similar tools?

States a specific verb and resource with explicit scope: 'Resolve one GitOps merge conflict by picking the winning side.' An agent can immediately distinguish it from list_gitops_conflicts (enumeration) and get_gitops_conflict_diff (inspection) without opening any schema.

Agents choose between tools based on descriptions. A clear purpose with a specific verb and resource helps agents select the right tool.

Usage Guidelines5/5

Does the description explain when to use this tool, when not to, or what alternatives exist?

Gives an explicit prerequisite workflow: 'inspect the diff with get_gitops_conflict_diff and state which side you recommend before calling this,' naming the sibling tool and the ordering. It also implicitly scopes usage to a single conflict rather than bulk resolution.

Agents often have multiple tools that could apply. Explicit usage guidance like "use X instead of Y when Z" prevents misuse.

Try in Browser

Glama MCP Gateway

Add one secure layer between your agents and this server.