list_conflicts

List files with git conflicts including conflict types. Returns a map of ID to file info with conflict type and suggested resolution. (Rate limit: 2 calls per minute). IMPORTANT: You must run init_project before using this tool.

Server Git Conflict MCP mattyatea/git-conflict-mcp
Category Read
Risk class Low
Parameters 00 required

What list_conflicts does on Git Conflict MCP

AI agents call list_conflicts to retrieve information from Git Conflict MCP without modifying anything — typically the context-gathering step in research, monitoring, and reporting workflows, before the agent takes action elsewhere.

Why list_conflicts needs a policy

The tool performs read-only operations to identify and report conflicting files and their metadata. It returns information about conflicts but does not modify, delete, or execute any operations. The rate limiting and dependency on init_project do not change its fundamental read-only nature. This poses minimal risk if misused by an AI agent, as it only surfaces existing conflict information without side effects.

From the tool's definition Tool description states it 'List files with git conflicts' and 'Returns a map of ID to file info' — retrieval and query operations with no modification or deletion of data.

Questions about list_conflicts

What does the list_conflicts tool do? +

List files with git conflicts including conflict types. Returns a map of ID to file info with conflict type and suggested resolution. (Rate limit: 2 calls per minute). IMPORTANT: You must run init_project before using this tool. It is categorised as a Read tool in the Git Conflict MCP MCP Server, which means it retrieves data without modifying state.

How do I enforce a policy on list_conflicts? +

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

list_conflicts is a Read tool with low risk. Read-only tools are generally safe to allow by default.

Can I rate-limit list_conflicts? +

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

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

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

// LOOK UP ANOTHER SERVER

Every MCP server has a record like this.

Type a name, get the same breakdown: verified identity, auth posture, risk grade, capabilities, recommended policy.

Teams ship this data inside their own products. See what a licence covers →

// GET IN TOUCH

Have a question or want to learn more? Send us a message.

Message sent.

We'll get back to you soon.