---
schema_version: "1"
id: 31d0d658fa084183d27e3ba457e15ceff45d84b575bfb6c5fb0e8e9c5422fbc9
title: Merge Conflicts
collection: admin
version: current
locale: en-us
portal_url: https://docs.salesforce.com/admin/current/en-us/platform/264-0-0/devops_center_merge_conflicts_github.md
canonical_url: https://help.salesforce.com/s/articleView?id=platform.devops_center_merge_conflicts_github.htm&release=264.0.0&type=5
source_site: help.salesforce.com
content_type: documentation
content_hash: f4587adab368e0539a06a9c824deba5c8ded763cbd121c11a67d44233c4606cb
description: Merge conflicts can occur when multiple work items contain one or more of the same components, especially when multiple developers are making changes that impact the same components in different development environments. Lifecycle Center warns you about potential merge conflicts so you can investigate to ensure that you don’t inadvertently overwrite desired changes.
products:
  - Salesforce Platform
release: "264"
---
# Merge Conflicts

Merge conflicts can occur when multiple work items contain one or more of the same components, especially when multiple developers are making changes that impact the same components in different development environments. Lifecycle Center warns you about potential merge conflicts so you can investigate to ensure that you don’t inadvertently overwrite desired changes.

In this example scenario, two developers are adding new fields to the same standard object, which creates potential merge conflicts in the page layouts.

![Potential Conflict Detected dialog that describes the conflict, which work items are involved, and what you can do about it.](https://sf-zdocs-cdn-prod.zoominsoftware.com/tdta-platform-devops_center-264-0-0-production-enus/166010c3-4c34-4087-92ad-aea917baf524/devops_center/images/promotion-conflict-dialog.png)

Before you proceed, read the information about the potential conflict to determine what to do next.

## Continue with Promotion

Based on the conflict description, you feel comfortable that the changes don’t overwrite each other.

## Cancel Promotion

Based on the conflict description, you’re uncertain that the changes don’t overwrite each other, or you’d like to look at the pull request for the work item, which indicates whether the source control repository has detected merge conflicts. After you complete your investigation, you either resolve the merge conflicts in the source control repo, sync the changes in the development environments, or continue with the promotion, which could fail if there’s a merge conflict.

## If the Promotion Fails

If the promotion fails, here are some options:

- Promote each work item individually.
    - If all individual work items are promoted to the next stage successfully, your work is done (for now).
    - If some work items are promoted successfully and some aren’t, review the change request to resolve the merge conflicts manually in the branch in the source control system.
- Sync the development environments, or resolve the conflicts directly in the development environments, then try the promotion process again.
- Custom promotion in Lifecycle Center: Promote individual work items from a stage. See [Custom Promotion](https://help.salesforce.com/s/articleView?id=platform.devops_center_custom_promotion.htm&release=264.0.0&type=5 "Select and promote individual work items that are ready for the next pipeline stage by using custom promotion.").