---
schema_version: "1"
id: b40047ffd7b7a6c6776c6d389e313401edd74fc75d7407d06a2aa4581de99561
title: Merge Conflict Resolution with DevOps Center MCP Tools (Managed Package)
collection: admin
version: current
locale: en-us
portal_url: https://docs.salesforce.com/admin/current/en-us/platform/264-0-0/devops_center_mcp_intro.md
canonical_url: https://help.salesforce.com/s/articleView?id=platform.devops_center_mcp_intro.htm&release=264.0.0&type=5
source_site: help.salesforce.com
content_type: documentation
content_hash: f06008188e2d78c61fb59097233a9fa8d602cd995ab7c93f40f11afdd61378fc
description: 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).
products:
  - Salesforce Platform
release: "264"
---
# 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](https://sf-zdocs-cdn-prod.zoominsoftware.com/tdta-platform-devops_center-264-0-0-production-enus/166010c3-4c34-4087-92ad-aea917baf524/images/icon_note.png)

Note This article provides information about the DevOps Center managed package. Starting in April 2026, Salesforce offers Lifecycle Center. For information about the new version, see [Lifecycle Center](https://help.salesforce.com/s/articleView?id=platform.next_generation_devops_center.htm&release=264.0.0&type=5 "Lifecycle Center (formerly next-generation DevOps Center) brings modern DevOps best practices to your team with an AI-powered, click-based user interface (UI). Built on the principles of DevOps Center (Managed Package), Lifecycle Center serves as a central development hub where your team can collaborate—with built-in governance that keeps coding agents and users safe and compliant."). 

Salesforce DX MCP Server is designed with multiple layers of security to protect your data and credentials. See [Salesforce DX MCP Server and Tools](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_mcp.htm) .

For information about resolving conflicts in Lifecycle Center using MCP tools, see [Resolve Merge Conflicts with DevOps Center MCP Tools](https://help.salesforce.com/s/articleView?id=platform.devops_center_mcp_resolve_merge_conflicts.htm&release=264.0.0&type=5 "Detect, analyze, and resolve merge conflicts directly within your workflow. You can start this process using the Resolve with Agentforce option in the Lifecycle Center UI, which opens the Agentforce Vibes IDE with the Agentforce Vibes Extension and adds the conflict details to your prompt.").

- **[Resolve Merge Conflicts by Using DevOps Center MCP Tools](https://help.salesforce.com/s/articleView?id=platform.devops_center_mcp_resolve_usecase.htm&release=264.0.0&type=5)**  
    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.

#### See Also

- [Install and Configure the Salesforce DX MCP Server (Beta)](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_mcp_server.htm)
- [MCP Solutions for Developers](https://developer.salesforce.com/docs/einstein/genai/guide/mcp.html)