Debbie and Dave were modifying the same Apex class on their individual sandboxes, Debbie deployed first without any issue, but when Dave tried to deploy, a Git conflict arose, so they teamed up and resolved it manually with Copado’s online conflict resolution feature.
What happens when both
user stories are moved to the next environment?
A . No conflict is reported. Copado uses the auto-resolve conflict resolution feature to apply the changes from the latest deployment to the Apex class.
B . The conflict is reported again but just as a warning. They are able to deploy.
C . Copado reports the conflict again and they need to fix it manually to be able to deploy.
D . Copado uses the conflict solution that was previously created.
Answer: D