COPADO-DEVELOPER practice question 14 of 15

Within the same sprint, Debbie added, a defaultPhone method and Dave added a defaultUrl method, both to the account operations class. Since, Debbie…

Full set: 84 questions
Within the same sprint, Debbie added, a defaultPhone method and Dave added a defaultUrl method, both to the account operations class. Since, Debbie and Dave are working in their individual sandboxes, after promoting the second user story, a Git conflict arose. They leamed up to solve the conflict using Copado's online conflict resolution feature. What happens when both user stories are mass back-promoted?
Answer options
A: The defaultPhone method overwrites the other method.
B: Copado uses semantic conflict resolution.
C: The defaultUrl method overwrites the other method.
D: Copado uses the conflict solution that was previously created. Correct answer
Correct Answer:
D. Copado uses the conflict solution that was previously created.
Explanation

During the first promotion Debbie and Dave resolved the merge conflict online and Copado stored the merged version in the Git history. When the two user stories are subsequently mass back-promoted, Copado replays the exact merge commit that already contains the accepted resolution, so no new conflict is generated—the stored resolution is automatically reused.

Why Incorrect

A. Back-promotion brings the merged commit, not a single developer’s version, so neither method overwrites the other.
B. Copado’s Online Conflict Resolution is developer-driven, not an automatic semantic engine.
C. Same reason as A; Dave’s code does not overwrite Debbie’s.

References

1. Copado Documentation – “Online Conflict Resolution”, rev. 2023-02, section “Reusing an Existing Resolution during Back-Promotion”.

2. Copado Developer Guide v23.1, Chapter “Mass Back-Promotion”, p. 75–76.

Scroll to Top