TechSkribbleBuy
beginnerPremium

Merge Conflicts Have Shapes

the CONFLICT line names the shape, the shape names your move - watch one shape ruled end to end

Unlock every Git skribble and video: one purchase, yours to keep.

$99$79 USD

Buy Git

Watch

The narrated version of this skribble — tap play for the full-size video.

3:31

Merge Conflicts Have Shapes

Premium
🔒

Premium skribble

This lesson is part of the Git course. Unlock its full skribble and narrated video.

Unlock this course Already purchased? Sign in

More in Reading a Merge Conflict

You've reached the end of this skribble — here's what's next in this module.

The Merge View: Three Panes, One Ruling
🔒

The Merge View: Three Panes, One Ruling

git mergetool hands every tool the same three versions - yours, theirs, and the base both grew from

beginnerPremium
Reading Conflict Markers
🔒

Reading Conflict Markers

the <<<<<<< block is not damage - your side and theirs in plain text, and diff3 adds the base as referee

beginnerPremium
Resolving: Four Moves, One Exit Door
🔒

Resolving: Four Moves, One Exit Door

every button in every merge tool is one of four decisions - and git add is the resolved signal, not saving

beginnerPremium
The Rebase Flip: ours Is Not Yours
🔒

The Rebase Flip: ours Is Not Yours

during a rebase --ours is the branch you are rebasing ONTO - grabbing "mine!" keeps the other person's line

beginnerPremium