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 —
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.
Attacks that exploit this kind of access
The rule that runs sf_resolve_devops_merge_conflict safely
PolicyLayer is an MCP gateway: it sits between your AI agents and Salesforce Metadata Mcp, and checks every tool call against a rule you set before the call runs. Nothing changes on the server itself. For sf_resolve_devops_merge_conflict, this is the rule to start with:
sf_resolve_devops_merge_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.
The button opens the PolicyLayer dashboard: create your workspace, connect Salesforce Metadata Mcp, apply this rule, and every sf_resolve_devops_merge_conflict call is checked against it from then on.
Questions about 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 —. 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.
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.
sf_resolve_devops_merge_conflict is a Write tool with medium risk. Write tools should be rate-limited to prevent accidental bulk modifications.
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.
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.
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.
This server
Across the catalogue