Certified Development Lifecycle and Deployment Architect

By Salesforce · Question Mode

QuestionQ30

VerifiedContinuous Integration Techniques

Universal Containers (UC) has begun using 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 code that references the Case object. Both developers branched from the same UCDev branch (which maps to the Dev sandbox for Release Build) and began their work.

The Experience Cloud development team finished early, and its change was successfully merged into the UCDev branch. The Service Cloud developer’s local Git branch is named ServiceCase.

At which point will the Service Cloud developer encounter and need to resolve the conflict?

Explanation

A merge conflict occurs when Git compares or merges branches with competing changes. Staging, committing, and pushing affect only the ServiceCase branch; a pull request targeting UCDev compares ServiceCase with the now-updated base branch and reveals conflicts that must be resolved before the pull request can be merged.

Learn more

Community Discussion

No comments yet. Be the first to start the discussion!