🧩
MODULE 02 · 4 MIN READ
A conflict is a question, not an error
Git refused to guess which version of the line you meant — that refusal is the "conflict". It wrote both versions into the file, between markers:
notes.txt
<<<<<<< HEAD
Coffee is the best drink
=======
Tea is the best drink
>>>>>>> version-a
HEAD is the branch you're standing on; below the ======= is the branch you merged in. The markers are Git's handwriting — they are not code and must not stay in the file.
“Git isn't broken. Git is asking you a question.”