Salesforce Certified Development Lifecycle and Deployment Architect — Question 45

Universal Containers (UC) started to use the GitHub workflow. For the current minor release, an Experience Cloud developer and a Service Cloud developer both need to work on the Case object and codes that reference the Case object. Both developers branched off the same UCDev branch (maps to the Dev sandbox for Release Build) and started working.

The Experience Cloud development team had finished early, and the change was successfully merged into the UCDev branch. The local Git branch used by the Service Cloud developer is called ServiceCase.

At what point will the Service Cloud developer see the conflict and need to resolve the conflict?

Answer options

• A. At command: git commit -m "Service Cloud Notes"
• B. At command: git add force-app/main/default/
• C. At command: git push origin ServiceCase
• D. The conflict would show in GitHub when a pull request is created from ServiceCase to UCDev.

Correct answer: D

Explanation

The Service Cloud developer will encounter the conflict when they attempt to create a pull request from ServiceCase to UCDev, as their changes will conflict with those already merged by the Experience Cloud team. The other options do not trigger conflict detection since they occur before the pull request is made, where Git does not yet evaluate the integration of changes.