sf_resolve_devops_merge_conflict

Marks a merge conflict in DevOps Center as resolved with a specified resolution strategy. Use after manually resolving conflicts in the source control system. conflictId: merge conflict record ID resolution: resolution strategy —

SERVERSalesforce Metadata Mcp SOURCEsalesforce-metadata-mcp
Medium RISK CLASS
Category Write
Parameters 00 required
Recommended Rate-limitedsee the rule below
Registry record Grade F, identity unverified Pull the record →

This record as markdown: /tools/io-github-semwalajay83-sem-salesforce-metadata-mcp/sf-resolve-devops-merge-conflict.md

What sf_resolve_devops_merge_conflict does on Salesforce Metadata Mcp

AI agents use sf_resolve_devops_merge_conflict to create or update resources in Salesforce Metadata Mcp, usually the action step of a workflow, after the agent has gathered context. Every call changes real data in your Salesforce Metadata Mcp environment.

Why sf_resolve_devops_merge_conflict is rated Medium

This tool modifies the state of a merge conflict record from unresolved to resolved, which is a Write operation (creates or modifies data reversibly). It does not delete data (Destructive), execute arbitrary code (Execute), or transfer funds (Financial). While marking conflicts as resolved could have downstream effects if misused during an actual deployment, the tool itself is a state-modification write operation.

From the tool's definition Tool performs an irreversible state change: 'Marks a merge conflict in DevOps Center as resolved'. The description explicitly states this is a post-resolution action that updates conflict record status.

Questions about sf_resolve_devops_merge_conflict

What does the sf_resolve_devops_merge_conflict tool do? +

Marks a merge conflict in DevOps Center as resolved with a specified resolution strategy. Use after manually resolving conflicts in the source control system. conflictId: merge conflict record ID resolution: resolution strategy —. It is categorised as a Write tool in the Salesforce Metadata 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 sf_resolve_devops_merge_conflict? +

Register the Salesforce Metadata MCP server in PolicyLayer and add a rule for sf_resolve_devops_merge_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 Salesforce Metadata Mcp. Nothing to install.

What risk level is sf_resolve_devops_merge_conflict? +

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

Can I rate-limit sf_resolve_devops_merge_conflict? +

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

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

sf_resolve_devops_merge_conflict is provided by the Salesforce Metadata MCP server (salesforce-metadata-mcp). PolicyLayer sits as a proxy in front of this server to enforce policies before tool calls reach the server.

More on Salesforce Metadata, and thousands of servers like it.

Across the catalogue

// THE MCP REGISTRY

PolicyLayer tracks 44,603 MCP servers and 515,000+ tools.

Every server has a live record: who publishes it, whether it answers without auth, its risk grade, every tool classified, the recommended policy. This page is one line of Salesforce Metadata's. Pull the full record:

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.