---
schema_version: "1"
id: 93a759008dadbc2594c014a52bbb0e584d1925c73b201e4e4c58738ebbf6c11c
title: Resolve Merge Conflicts with Lifecycle Center MCP Tools
collection: admin
version: current
locale: en-us
portal_url: https://docs.salesforce.com/admin/current/en-us/platform/264-0-0/devops_center_mcp_resolve_merge_conflicts.md
canonical_url: https://help.salesforce.com/s/articleView?id=platform.devops_center_mcp_resolve_merge_conflicts.htm&release=264.0.0&type=5
source_site: help.salesforce.com
content_type: documentation
content_hash: c44f98f64e07e474840593fc618287b71b0114a93bcc293854035be5391ccbcb
description: 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.
products:
  - Salesforce Platform
release: "264"
---
# Resolve Merge Conflicts with Lifecycle Center MCP Tools

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.

### Required Editions

<table class="slds-table slds-table_bordered slds-max-medium-table_stacked slds-m-bottom_small edition"><colgroup><col></colgroup><tbody><tr class=""><td class="slds-cell-wrap" style="vertical-align:top;">Available in: Lightning Experience in <strong>Professional</strong> (API access required), <strong>Enterprise</strong>, <strong>Performance</strong>, <strong>Unlimited</strong>, and <strong>Developer</strong> Editions</td></tr></tbody><colgroup><col></colgroup><tbody><tr class=""><td class="slds-cell-wrap" style="vertical-align:top;">Not Available in: <strong>Government Cloud Plus</strong>. Contact your Salesforce account executive for more details.</td></tr></tbody><colgroup><col></colgroup><tbody><tr class=""><td class="slds-cell-wrap" style="vertical-align:top;">Not available in: <strong>EU Operating</strong> Zone. EU Operating zone is a special paid offering that provides an enhanced level of data residency commitment. Lifecycle Center <em>is</em> supported in orgs in the EU that aren’t part of EU OZ, per standard product terms and conditions.</td></tr></tbody></table>

Before you begin, set up the Salesforce DX MCP Server. See [Access Lifecycle Center MCP Tools](https://help.salesforce.com/s/articleView?id=platform.devops_center_mcp_access_tools.htm&release=264.0.0&type=5 "Set up Salesforce DX MCP Server for use with Agentforce Vibes IDE, integrated with Agentforce Vibes Extension as the MCP client. Use prompts in Agentforce, a part of Agentforce Vibes Extension, to do common DevOps tasks, like managing work items, and resolving merge conflicts.").

![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 If you are a DevOps Center (Managed Package) user and want to learn how to resolve merge conflicts using MCP tools, see [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.").

## Step 1: Detect and summarize conflicts

Identify the files causing the conflict and understand the nature of the conflict.

Prompt

"Check if my current branch has any merge conflicts."

How It Works

The `detect_devops_center_merge_conflict` tool scans Git to determine the merge state. It compares the feature branch with the target branch, identifies conflicting metadata, and suggests resolution strategies. For example, merge suggested, accept incoming, or keep yours.

Sample Response

"Conflicts have been detected between the work item branch WI-000036 and the target branch integration. The following files have conflicts:

\- force-app/main/default/classes/class\_name.cls

\- Conflict Type: Both branches modified the same line.

\- Explanation: The method has been modified in both branches with different debug messages.

\- Conflict Excerpt: \[Details\]

\- force-app/main/default/classes/new\_class\_name.cls

\- Conflict Type: Both branches modified the same line.

\- Explanation: The method has conflicting debug messages.

\- Conflict Excerpt: \[Details\]

To proceed with resolving these conflicts, you can use the `resolve_devops_center_merge_conflict` tool for further assistance."

## Step 2: Resolve the merge conflict

Apply a resolution strategy to the conflicting files.

Prompt

"Use AI to resolve the conflict."

How It Works

The `resolve_devops_center_merge_conflict` tool loads the specified file, applies the selected resolution strategy, and stages the file for commit.

Sample Response

"Task Completed

The merge conflicts between the work item branch WI-000036 and the target branch integration have been resolved successfully. The following actions were taken:

1\. Resolved conflicts in the files:

\- force-app/main/default/classes/class\_name.cls: Kept current changes from WI-000036.

\- force-app/main/default/classes/new\_class\_name.cls: Kept current changes from WI-000036.

2\. Committed the resolution with the message: 'Resolve merge conflicts between WI-000036 and integration'.

The branch is now conflict-free and ready for further actions."

## Step 3: Resume work item promotion

After conflicts are resolved, continue promoting your work items in Lifecycle Center.