Merge Conflict Resolution Panel

Updated 1 month 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. 

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:

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

How did we do?