COPADO-DEVELOPER practice question 15 of 15

Which of the following examples could potentially create a Git conflict?

Full set: 84 questions
Answer options
A: Merge the release branch into the destination branch.
B: Merge the feature branch into the source org's branch.
C: Merge the feature branch into the promotion branch.
D: B and C. Correct answer
Correct Answer:
D. B and C.
Explanation

Any 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.

Why Incorrect

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.

References

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”).

Scroll to Top