1 | P a g e | © copyright 2024/2025 | Grade A+
Copado Developer Trail Conflict
Resolution Questions and Answers
2024/2025
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.
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.
Rob has enabled the Online Conflict Resolution and he has been alerted of a
conflict. How can he review and resolve the conflicts detected?
Master01 | September, 2024/2025 | Latest update
Copado Developer Trail Conflict
Resolution Questions and Answers
2024/2025
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.
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.
Rob has enabled the Online Conflict Resolution and he has been alerted of a
conflict. How can he review and resolve the conflicts detected?
Master01 | September, 2024/2025 | Latest update