Skip to main content
Glama
semwalajay83-sem

salesforce-metadata-mcp

Resolve DevOps Center Merge Conflict

sf_resolve_devops_merge_conflict
Idempotent

Resolve a DevOps Center merge conflict by marking it as resolved with a chosen strategy—ours, theirs, or manual—after manually fixing conflicts in source control.

Instructions

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 — 'ours' (keep our changes), 'theirs' (accept incoming), or 'manual' (already resolved)

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault
conflictIdYesMerge conflict record ID
resolutionYesResolution strategy
Behavior3/5

Does the description disclose side effects, auth requirements, rate limits, or destructive behavior?

Annotations already declare idempotentHint=true and destructiveHint=false, covering the safety profile. The description adds the meaning of the resolution strategies and the prerequisite. However, it doesn't describe any side effects, return values, or what happens to the conflict record after resolution. With annotations doing the heavy lifting, this is acceptable but not rich.

Agents need to know what a tool does to the world before calling it. Descriptions should go beyond structured annotations to explain consequences.

Conciseness5/5

Is the description appropriately sized, front-loaded, and free of redundancy?

The description is concise, with a clear first sentence for the main action and a second paragraph for parameter details. No wasted words, and the information is front-loaded. It earns its place.

Shorter descriptions cost fewer tokens and are easier for agents to parse. Every sentence should earn its place.

Completeness4/5

Given the tool's complexity, does the description cover enough for an agent to succeed on first attempt?

For a simple two-parameter tool with no output schema, the description covers the core action, the prerequisite, and parameter semantics. It does not describe the return value or postconditions, but given the tool's simplicity and the presence of annotations, it is complete enough for an agent to use it correctly.

Complex tools with many parameters or behaviors need more documentation. Simple tools need less. This dimension scales expectations accordingly.

Parameters4/5

Does the description clarify parameter syntax, constraints, interactions, or defaults beyond what the schema provides?

Schema coverage is 100%, but the description adds critical semantics by explaining the exact meaning of each resolution enum value ('ours' = keep our changes, 'theirs' = accept incoming, 'manual' = already resolved). This goes beyond the schema's bare field descriptions and helps the agent choose correctly.

Input schemas describe structure but not intent. Descriptions should explain non-obvious parameter relationships and valid value ranges.

Purpose5/5

Does the description clearly state what the tool does and how it differs from similar tools?

The description uses a specific verb ('Marks') and clearly identifies the resource ('merge conflict in DevOps Center'). It also distinguishes itself from sibling tools like sf_detect_devops_merge_conflict by focusing on resolution. The resolution strategy parameter is explicitly explained.

Agents choose between tools based on descriptions. A clear purpose with a specific verb and resource helps agents select the right tool.

Usage Guidelines4/5

Does the description explain when to use this tool, when not to, or what alternatives exist?

Provides explicit guidance: 'Use after manually resolving conflicts in the source control system.' This clearly indicates the prerequisite and context. It doesn't mention alternatives or exclusions, but for a niche resolution action, the usage context is sufficiently clear.

Agents often have multiple tools that could apply. Explicit usage guidance like "use X instead of Y when Z" prevents misuse.

Install Server

Other Tools

Latest Blog Posts

MCP directory API

We provide all the information about MCP servers via our MCP API.

curl -X GET 'https://glama.ai/api/mcp/v1/servers/semwalajay83-sem/salesforce-metadata-mcp'

If you have feedback or need assistance with the MCP directory API, please join our Discord server