resolve_conflict · Git Conflict MCP: Risk & Policy

WHAT IT DOES

What resolve_conflict does on Git Conflict MCP

AI agents use resolve_conflict to create or update resources in Git Conflict MCP — usually the action step of a workflow, after the agent has gathered context. Every call changes real data in your Git Conflict MCP environment.

WHY IT NEEDS A POLICY

Why resolve_conflict needs a policy

This tool initiates a conflict resolution request in a Git repository. While it modifies the state of conflict tracking/workflow, the actual resolution is deferred to a human via WebUI, making it a Write operation rather than Execute or Destructive. Misuse could corrupt merge state or disrupt resolution workflows, but changes are human-reviewed before finalization.

From the tool's definition 'Request conflict resolution by its ID or file path. The actual resolution will be performed by a human through the WebUI.'

Attacks that exploit this kind of access

Recommended rule Ready

Verdict

resolve_conflict Rate-limited

resolve_conflict stays usable, but capped — an agent stuck in a loop can't make hundreds of changes a minute. Everything else on the server is denied unless you say otherwise.

View as policy code

policy.json

{
  "version": "1",
  "default": "deny",
  "tools": {
    "resolve_conflict": {
      "limits": [
        {
          "counter": "resolve_conflict_rate",
          "window": "minute",
          "max": 30,
          "scope": "grant"
        }
      ]
    }
  }
}

LIMIT THIS TOOL →

Instant setup, no code required.

PolicyLayer is an MCP gateway: every tool call is checked against your rule before it reaches Git Conflict MCP, so you can run agents against it safely.

FAQ

Questions about resolve_conflict

What does the resolve_conflict tool do? +

Request conflict resolution by its ID or file path. The actual resolution will be performed by a human through the WebUI. Supports different resolution types for various conflict scenarios (content conflicts, delete/modify conflicts, etc.). You must run post_resolve before running this tool. It is categorised as a Write tool in the Git Conflict MCP MCP Server, which means it can create or modify data. Consider rate limits to prevent runaway writes.

How do I enforce a policy on resolve_conflict? +

Register the Git Conflict MCP server in PolicyLayer and add a rule for resolve_conflict: allow, deny, rate-limit, or require approval. Point your MCP client at the PolicyLayer proxy URL and the rule is enforced on every call, before it reaches Git Conflict MCP. Nothing to install.

What risk level is resolve_conflict? +

resolve_conflict is a Write tool with medium risk. Write tools should be rate-limited to prevent accidental bulk modifications.

Can I rate-limit resolve_conflict? +

Yes. Add a rate_limit block to the resolve_conflict rule in your PolicyLayer policy. For example, setting max: 10 and window: 60 limits the tool to 10 calls per minute. Rate limits are tracked per agent session and reset automatically.

How do I block resolve_conflict completely? +

Set action: deny in the PolicyLayer policy for resolve_conflict. The AI agent will receive a policy violation error and cannot call the tool. You can also include a reason field to explain why the tool is blocked.

What MCP server provides resolve_conflict? +

resolve_conflict is provided by the Git Conflict MCP server (mattyatea/git-conflict-mcp). PolicyLayer sits as a proxy in front of this server to enforce policies before tool calls reach the server.