Outcome. Read both sides of a conflict, choose a resolution on its merits, complete the merge, and verify the result — or abort cleanly.
Before you start: Branches and merging basics
The duration is an estimate of engaged work, not a timer — nothing here waits. Steps marked "Check" and "Practice" are verified in the browser; "Read" and "Lab" steps are yours to confirm.
Read this and "A conflict, end to end". Identify what `<<<<<<< HEAD` means relative to the branch you are on.
- Predict
Predict: are the markers the problem?
≈ 1 min✓ doneA common shortcut, examined.
The check requires the *right* value, no markers, the rest of the file untouched, and a real merge commit.
Scenario: Resolve a merge conflict — completes automatically when the simulator's check passes.
Know the exit before you need it: `git merge --abort`.
Includes the abort step. Mark this step after the `grep` for markers prints "clean".
The lesson's check.
Completes when the knowledge check on that page has been attempted.
Session complete
Next: Git rerere: stop resolving the same conflict twice — Once resolving is routine, the next thing to learn is how Git can remember a resolution — and when you should not let it.
Keep building your Git skills. Get one practical technique, one workflow, and one security lesson each week. Modern Git Weekly is not taking subscriptions yet — read thesample issue, or follow new lessons by RSS.
When you are done: Git rerere: stop resolving the same conflict twice. Once resolving is routine, the next thing to learn is how Git can remember a resolution — and when you should not let it.
How did this go?
Unexpected output. Compare your output with the expected block line by line; the first differing line is usually the cause. Then check the version-sensitive notes.
Missing prerequisite. Most "stuck" moments here come from one earlier concept. The prerequisites list names it; the learning path puts it in order.
Unclear explanation. Read the explanation section, then the mental model, then retry the step — the command usually makes sense once the model is in place.
Instructions did not match my environment. Check `git --version` and your shell (Git Bash vs PowerShell vs zsh). Platform notes on the page name the differences that matter; the verification step confirms you are back to a known state.
Good. The next step is to do it without the page open — or move to the recommended next activity below.
All help on this page: Git troubleshooting decision tree · Find the lesson that comes before this one · How Git works — the model behind the commands · Recover a lost commit (lab)