Merge Conflict Resolution Panel

Updated 6 months ago by Copado Solutions

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. 

Copado has redesigned this feature with a full-screen two-panel and three-panel resolve conflict interface that helps you easily navigate through the code and fix the conflicts:

Arrows pointing to the conflicts that need to be resolved have been added to make the resolution easier. Click on each of the arrows, 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:

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

How did we do?