Merge Conflict Resolution Panel

Updated 2 months ago by Copado Solutions

Overview

When promoting user stories in Copado, there can be merge conflicts. Copado’s Online Conflict Resolution feature allows you to review these conflicts and resolve them before launching the deployment. 

The Online Conflict Resolution feature provides a full-screen two-panel and three-panel resolve conflict interface that is collapsed by default to just display conflicting lines and help you easily fix the conflicts. If you want to see the extended lines, simply click on the dots:

Click on the arrows next to the conflicting lines, and Copado will automatically update the conflict:

You can also choose to display the files in XML or YAML format, switching  from XML to YAML at will:

Panels 

Now, let’s take a look at what each panel represents in the two and three panels view. 

  • In the two-panels view:
    • Resolution: This panel highlights conflicted lines that belong to the promotion branch (a copy of the target branch). Non-conflicting lines in the panel represent changes that have already been merged by Git. The version built in this panel represents the final version of the file used to resolve conflicts and that will be merged into your target branch and deployed to the target environment.
    • Conflicts in Feature branch: This panel highlights conflicted lines that belong to the feature branch. Non-conflicting lines in the panel represent changes that have already been merged by Git.

Two Panel view

 

  • In the three-panels view:
    • Resolution: The version built in this panel represents the final version of the file used to resolve conflicts and that will be merged into your target branch and deployed to the target environment.
    • Conflicts in Feature branch: This panel highlights conflicted lines that belong to the feature branch. Non-conflicting lines in the panel represent changes that have already been merged by Git.
    • Conflicts in Promotion branch: This panel highlights conflicted lines that belong to the promotion branch (a copy of the target branch). Non-conflicting lines in the panel represent changes that have already been merged by Git.
Three Panel view

This information has been added to the panels as tooltips to understand better, as you’re working with them, what each one displays. 

For more information about conflict resolution, check out the article Conflict Resolution in Copado.


How did we do?