Conflict Crusher · FahamLah

The problem

$

Party mode meets your diary. Three conflicts! Then a messy branch to tidy. Ready to crush them all?

Watch

~/diary $ git merge partyAuto-merging index.htmlCONFLICT (content): Merge conflict in index.htmlAuto-merging style.cssCONFLICT (content): Merge conflict in style.cssAutomatic merge failed; fix conflicts and then commit the result.~/diary $ git statusOn branch mainYou have unmerged paths.  (fix conflicts and run "git commit")  (use "git merge --abort" to abort the merge)Unmerged paths:  (use "git add <file>..." to mark resolution)        both modified:   index.html        both modified:   style.cssno changes added to commit (use "git add" and/or "git commit -a")

Two files, three clashes. Read each one. Choose what stays. Mistakes are free, so experiment!

Try it

Crush all three conflicts. Title: keep yours. Day 5: keep both. Colour: keep theirs.

Pick what stays in each conflict. Then finish.

Conflicts left: 3 of 3

index.html

<<<<<<< HEAD

<h1>My Git Diary</h1>

=======

<h1>Party Diary</h1>

>>>>>>> party

<p>Day 1: I learned Git.</p>
<p>Day 2: I learned branches.</p>
<p>Day 3: I learned merging.</p>
<p>Day 4: I learned rebase.</p>

<<<<<<< HEAD

<p>Day 5: I fixed conflicts.</p>

=======

<p>Day 5: Party time!</p>

>>>>>>> party

Check

Halfway through, you panic. Which command puts everything back to before the merge?

Try it

Four quick drills in the terminal. Each one starts fresh.

Step 1 of 4: Urgent switch

Dark mode is half done. Put it aside and go to main.

Working folder

Staging area

Empty

Repository

4 save points
Start dark mode
Add style
Add day 1 page

Hint

Stuck? git status and git branch tell you where you are.

Try it

Last one: the recipes branch. Fix up “oops” into the page. Rename “add cake” to “Add cake recipe”. Drop “temp debug”.

Each card is one commit. Pick an action. Drag the grip or use the arrows to reorder.

$ git rebase -i main

Top = oldest. Git replays the cards from the top down.

c276142 Add recipes page
Action for Add recipes pagekeep it
5cc4c34 oops
Action for oopskeep it
3646b92 add cake
Action for add cakekeep it
f0886f8 temp debug
Action for temp debugkeep it
51b0794 Add pancake recipe
Action for Add pancake recipekeep it

History before

Check

You already shared the recipes branch. Mei built on it. Can you still tidy it with git rebase -i?

You did it!

You can now crush conflicts and keep your history clean.