🔀Merge Conflict
Also known as Git Conflict, Conflict
Two branches changed the same lines, so Git asks you to choose what stays.
Think of it like
Think of it like two people writing on the same line of a card. Someone has to pick what it says.
Example
Jack made the greeting blue and Emma made it red. When they merge, Git shows both lines and Jack picks one.
Why it matters
Conflicts happen on every team. Knowing how to read the markers turns a scary moment into a quick fix.
Definition
Example code
text
<<<<<<< HEAD
Hello, blue
=======
Hello, red
>>>>>>> redCommon mistake
Key takeaways
- 1Same lines, two changes. Git cannot pick for you.
- 2Markers show both. Yours on top, theirs below.
- 3Edit, then commit. Remove the markers when done.