Copado Academy

Copado Conflict Resolution Course

Copado Documentation

https://docs.copado.com/articles/#!copado-ci-cd-publication/conflict-resolution-in-copado

Important Considerations

• To understand the metadata that is currently set for Manual Resolution, check the current Copado Pipeline record in Icare org, specifically the "Exclude From Auto Resolve", bear in mind that not all metadata must be manually solved, because this would create a huge amount of work which is not required in 99% of the scenarios (above courses and documentation provide more details on this).
• When there is doubt about the proper resolution, check the user story that is originating the conflicts (copado UI shows the ID of this story in the same conflicts screen), and contact the responsible developer for co-operation.
• If there are User stories pending to be back-promoted to an org, and you are getting conflicts while deploying a story from this org, it's highly possible that the reason of the conflict is because the back-promotions have not been done. In this case, it's recommended that first the pending back-promotions are done (some conflicts may appear and must be solved), and after that continue with the deployment of the user stories. This can be evaluated depending on the scenario.