84.6k views
2 votes
Rob has enabled the Online Conflict Resolution and he has been alerted of a conflict. How can he review and resolve the conflicts detected?

(a) He can create a Pull Request from the Promotion
(b) He can click on Review Merge Conflict in the related Promotion record
(c) He can click on Review Merge Conflict in the User Story

User Hsandt
by
8.7k points

1 Answer

6 votes

Final answer:

Rob can review and resolve conflicts detected in the Online Conflict Resolution by creating a Pull Request, or by clicking on 'Review Merge Conflict' in the related Promotion record or User Story.

Step-by-step explanation:

To review and resolve conflicts detected in the Online Conflict Resolution, Rob has a couple of options. Firstly, he can create a Pull Request from the Promotion. This allows him to compare and merge changes within the code and address conflicts. Secondly, he can click on 'Review Merge Conflict' in the related Promotion record. This will provide him with a detailed view of the conflicts and allow him to resolve them. Finally, he can also click on 'Review Merge Conflict' in the User Story, which will display the conflicts and provide options to address them.

User James Tomasino
by
8.1k points