When is the Online Conflict Resolution feature triggered?

The Online Conflict Resolution feature is triggered after detecting a merge conflict. This feature is designed to help manage situations where multiple changes are made to the same component in a version control system, leading to potential conflicts when merging those changes.

When a deployment is initiated, Copado performs a series of checks and preparations. If it identifies that a merge conflict exists due to overlapping changes from different sources, it activates the Online Conflict Resolution feature. This allows users to resolve the conflicts in real-time, helping to ensure that the deployment can proceed smoothly without manual intervention or downtime.

In contrast, other events like during the deployment, after a successful commit, or during the promotion do not inherently trigger the Online Conflict Resolution feature; these phases are more focused on executing deployment processes or ensuring that changes are correctly applied without addressing merge conflict scenarios that may have arisen prior to or during these steps.