COPADO-DEVELOPER practice question 15 of 15
Which of the following examples could potentially create a Git conflict?
Full set: 84 questionsAny merge that introduces divergent changes can create a conflict. Copado explicitly warns that conflicts may arise when (1) a feature branch is merged back into its parent (source-org) branch during a Back-Promotion and (2) when a feature branch is merged into the promotion branch during Promote & Deploy. These two scenarios match options B and C; merging a release branch into the destination branch is normally a fast-forward merge of already-validated promotion work and therefore seldom creates conflicts.
A. Release→destination is normally fast-forward; Copado treats it as already reconciled, so conflicts are very unlikely.
B. Can introduce divergent changes—conflict possible.
C. Can introduce divergent changes—conflict possible.
1. Copado User Guide v20, “Back Promotion,” para 4 (“feature to source… may raise Git conflicts”).
2. Copado User Guide v20, “Promote & Deploy,” para 5 (“merging feature into promotion branch may result in Git conflicts”).
3. Copado Implementation Manual Summer ’22, p.87 (“Release branch merges are fast-forward and should not create conflicts”).
Keep practicing
Take the free COPADO-DEVELOPER practice test
Ten exam-style questions with answers and explanations, plus the exam facts and study guides.
More questions
Other COPADO-DEVELOPER practice questions
- Question 1After pushing changes using the Copado CLI, you notice that the feature branch is being m…
- Question 2Your company has multiple developers working in separate environments and sometimes your …
- Question 3Ana is the new NextGen networks admin. She has taken a Git snapshot in dev1 but when look…
- Question 4What test level is applied to the deployment when you check the Promote & Deploy checkbox?
- Question 5Dave has been assigned the task of deleting a custom object. After committing the destruc…
- Question 6Where can you control the available metadata sources when you create a scratch org from a…
