Resolution
After deploying an update to the account operation class, the QA team noticed some
previous functionality was overwritten by the Auto-Resolve Functionality. How can you
prevent this issue for all new Promotions? - ✔️✔️Exclude Apex Classes in the Exclude
From Autoresolve field in the Pipeline Record.
For some components, a Manual conflict resolution is a better approach. For which
metadata types is it a good idea to use the Exclude from Auto-Resolve? - ✔️✔️Layouts
and Apex Classes
Apex Triggers.
When is the Online Conflict Resolution triggered? - ✔️✔️After detecting a merge
conflict between a feature branch and the Promotion branch.
Rob has enabled the Online Conflict Resolution and he has been alerted of a conflict.
How can he review and resolve the conflicts detected? - ✔️✔️He can click on Review
Merge Conflict in the related Promotion record.
What types of Conflict Resolution processes can be executed with Copado? -
✔️✔️Auto-Resolve and Manual Resolution.