Categories//mmit/The Merge Conflict

The Merge Conflict

beginner8 min80 pts

The release branch for v2.4.0 has merge conflicts after pulling in the subscription management feature.

“The release is tomorrow. Can you review these conflicts and tell me which side should win for each?”

What you're being evaluated on

Conflict resolution strategy - Understanding which changes to keep and why.

Dependency awareness - Recognizing breaking changes in dependency versions.

Both-sides thinking - Some conflicts need code from both branches.

3 hints available (using hints reduces your score)

About this scenario

Resolve a 3-way merge in a release branch. Which changes should win? The release branch for v2.4.0 has merge conflicts after pulling in the subscription management feature.

beginner · 80 points · 8 min · Git & Gitflow

What you will practice

Conflict resolution strategy - Understanding which changes to keep and why.
Dependency awareness - Recognizing breaking changes in dependency versions.
Both-sides thinking - Some conflicts need code from both branches.

Play the full scenario above for free. More Git & Gitflow scenarios · Create a free account to save your progress.