When does the Online Conflict Resolution in Copado get triggered?

The Online Conflict Resolution in Copado is triggered specifically when a merge conflict is detected. This mechanism is designed to facilitate a streamlined resolution process when there are conflicting changes in the code that cannot automatically be merged. When developers attempt to merge changes from different branches and conflicting modifications are found, the Online Conflict Resolution tool becomes essential in helping to identify the issues and providing a user-friendly interface to resolve them directly within the Copado platform.

The other scenarios mentioned, such as making changes to the promotion branch, initiating a deployment, or creating a new feature branch, do not specifically engage the conflict resolution process, which is solely focused on managing the conflicts that arise during the merging of code changes. This illustrates the importance of the tool in maintaining code integrity and collaboration within the development lifecycle.