MODULE 02 · 6 MIN READ
Resolve it in three steps
1. Edit the file so it says what it should say — your answer can be version A, B, or something new. You're the human, you decide. Delete every marker line.
2. Stage it — that's how you tell Git "question answered". 3. Commit — the universes join.
$ edit notes.txt
$ git add notes.txt
$ git commit -m "Merge version-a, keep both drinks"
[main d4e5f6a] Merge version-a, keep both drinks
merge complete — the universes joined 🎉
Watch the graph: two lines join back into one at a diamond-shaped commit. You have now survived a merge conflict.
COMMIT GRAPH · on branch main
a tiny simulated laptop — your Day 1 repo is preloaded.
// try: git switch -c version-a → edit notes.txt → git commit -am "Vote tea" → git switch main → edit notes.txt → git commit -am "Vote coffee" → git merge version-a → edit notes.txt → git add notes.txt → git commit -m "merge"