In Dev1, Debbie has added a new method to an Apex class. She has committed the user story and
deployed the user story to UAT. In Dev2, Dave has added a method to the same class and has
deployed the changes to UAT. This has reported a conflict, so Dave has teamed up with Debbie and
resolved it manually.
What happens when the user stories are moved to the next environment?
A . The conflict is reported again but just as a warning. They can deploy.
B . There is no Git conflict since Copado has already stored the solution to the conflict.
C . No conflict is reported. Copado uses the auto-resolve conflict resolution feature to apply the changes from the latest deployment to the Apex class.
D . The conflict is reported again and they need to fix it manually in order to be able to
deploy.
Answer: C