Salesforce Plat-Arch-202 Question Answer
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 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?

