Merge Conflict Resolution with DevOps Center MCP Tools (Managed Package)

The DevOps Center Model Context Protocol (MCP) tools in Salesforce DX MCP Server are a set of capabilities that simplify and accelerate the resolution of merge conflicts. The MCP server uses large language models (LLMs) to analyze conflicts, translate them into natural language explanations, and suggest solutions, so you can use natural language prompts instead of commands. Access these tools through Agentforce Vibes in your Integrated Development Environment (IDE).

Note This article provides information about the DevOps Center managed package. Starting in April 2026, Salesforce offers next-generation DevOps Center. For information about the new version, see Next Generation DevOps Center. 

Salesforce DX MCP Server is designed with multiple layers of security to protect your data and credentials. See Salesforce DX MCP Server and Tools .

For information about resolving conflicts in next-generation DevOps Center using MCP tools, see Resolve Merge Conflicts with DevOps Center MCP Tools.

• Resolve Merge Conflicts by Using DevOps Center MCP Tools
  Resolve merge conflicts by using natural language prompts. The provided prompts are examples that you can customize to suit your needs. The sample response varies based on the LLM that you use.