Two Cooks, One Recipe

You both edited the same step of the same recipe. Git refuses to guess who's right. Time to resolve this — yourself.

Scene I

Two different edits

YOUR VERSION

THEIR VERSION

🧂

"Add 2 spoons of sugar."

🚫

"Add NO sugar."

"I cannot choose who's right. Both of you updated Step 3 of the same recipe."

— THE HISTORIAN (GIT)

⚔️ CONFLICT RESOLUTION Conflict 1 / 3

Result

You manually decided the final truth for every conflict. That's exactly what a merge conflict resolution looks like.

$ git merge feature/friend-recipe

CONFLICT (content): Merge conflict in recipe.md

Automatic merge failed; fix conflicts and then commit.

# You open the file, choose the right version...

$ git add recipe.md

$ git commit -m "Resolved merge conflict"

✓ Merge complete.

Epilogue

Git is a historian,
not a philosopher.

It records facts. It doesn't resolve opinions. When two people change the same thing, Git stops and says:
"You decide."

<<<<<<< HEAD (yours)

Add 2 spoons of sugar.

=======

Add NO sugar.

>>>>>>> friend/branch

# YOU manually decide the final truth.