Loading
Feature Degradation | Agentforce Voice Read More
Manage and Release Changes Easily and Collaboratively with DevOps...
Table of Contents
Filter by (0)Add
Select Filters

          No results
          No results
          Here are some search tips

          Check the spelling of your keywords.
          Use more general search terms.
          Select fewer filters to broaden your search.

            Search all of Salesforce Help
            Search all of Salesforce Help
            Resolve Merge Conflicts in Next Generation DevOps Center

            You are here:

            1. Salesforce Help
            2. Docs
            3. DevOps Center

            Resolve Merge Conflicts in Next Generation DevOps Center

            Next-generation DevOps Center uses Agentforce to streamline conflict resolution for both low-code admins and developers. By integrating with Agentforce Vibes, DevOps Center provides AI-assisted guidance whether you work in the UI or the IDE.

            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.

            Resolve Conflicts from the UI (Low-Code)

            If you're a low-code developer or admin, use DevOps Center MCP tools to manage conflicts without writing commands. When DevOps Center detects a conflict during a promotion, the pipeline highlights the specific blocked work item with an error notification.

            Click the Resolve with Agentforce button to automatically launch Agentforce Vibes IDE. DevOps Center preloads the specific error message and context into the prompt. You can interact with Agentforce to review the conflicting files and accept the recommended fixes.

            Resolve with Agentforce button in the pipeline

            Resolve Conflicts Using DevOps MCP Tools

            Use DevOps Center MCP tools to detect, analyze, and resolve conflicts programmatically. When working within Agentforce Vibes IDE, Agentforce automatically detects the merge conflict. It adds the error details to the prompt. Ask Agentforce Vibes to explain the differences between the files or suggest a solution.

            See Also

             
            Loading
            Salesforce Help | Article