Resolve a Merge Conflict

Fix a conflicted merge and complete it.

A intermediate Git challenge worth 10 points. Solve it hands-on in a real Git environment in your browser - no local setup, no fake shells.

The Challenge

Scenario: Merging feature into main left a conflict in /tmp/repo/color.txt.

Task: Edit color.txt to resolve the conflict (remove the markers), then commit the merge.