You are here:
Resolve Merge Conflicts with DevOps 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 next-generation DevOps Center UI, which opens the Agentforce Vibes IDE with the Agentforce Vibes Extension and adds the conflict details to your prompt.
Required Editions
| Available in: Lightning Experience in Professional (API access required), Enterprise, Performance, Unlimited, and Developer Editions |
| Available in: Government Cloud Plus as interoperable. Turning on DevOps Center in Government Cloud Plus orgs can send data outside the authorization boundary. Contact your Salesforce account executive for more details. |
| Not available in: EU Operating Zone. EU Operating zone is a special paid offering that provides an enhanced level of data residency commitment. DevOps Center is supported in orgs in the EU that aren’t part of EU OZ, per standard product terms and conditions. |
Before you begin, set up the Salesforce DX MCP Server. See Access the DevOps Center MCP Tools.
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.
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_conflicttool 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_conflicttool 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_conflicttool 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 DevOps Center.
Did this article solve your issue?
Let us know so we can improve!
