resolve_pending_resolution · Git Conflict MCP: Risk & Policy

WHAT IT DOES

What resolve_pending_resolution does on Git Conflict MCP

AI agents use resolve_pending_resolution 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_pending_resolution needs a policy

This tool creates or modifies data (the resolution status) in a reversible manner. Approving or rejecting a resolution changes metadata about conflict resolution attempts but does not irreversibly delete data (Destructive), execute arbitrary code (Execute), involve financial transactions (Financial), or merely read data (Read).

From the tool's definition Tool name 'resolve_pending_resolution' and description 'Approve or reject a pending resolution' indicate the tool modifies the state of a pending resolution object, changing its status from pending to approved or rejected.

Attacks that exploit this kind of access

Recommended rule Ready

Verdict

resolve_pending_resolution Rate-limited

resolve_pending_resolution 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_pending_resolution": {
      "limits": [
        {
          "counter": "resolve_pending_resolution_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_pending_resolution

What does the resolve_pending_resolution tool do? +

Approve or reject a pending resolution. 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_pending_resolution? +

Register the Git Conflict MCP server in PolicyLayer and add a rule for resolve_pending_resolution: 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_pending_resolution? +

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

Can I rate-limit resolve_pending_resolution? +

Yes. Add a rate_limit block to the resolve_pending_resolution 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_pending_resolution completely? +

Set action: deny in the PolicyLayer policy for resolve_pending_resolution. 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_pending_resolution? +

resolve_pending_resolution 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.