TechSkribbleBuy
beginnerPremium

The Three-Way Merge: One Commit, Two Parents

one line splits, both sides work, git reunites them through the shared base - the whole story on one line

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.

5:10

The Three-Way Merge: One Commit, Two Parents

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 Timelines

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

git branch & git switch: Name First, Move Second
🔒

git branch & git switch: Name First, Move Second

a new branch is just a second name on your commit - switch is what moves you, and it refuses to lose edits

beginnerPremium
git switch -c and --detach: Two Ways to Move
🔒

git switch -c and --detach: Two Ways to Move

-c creates the branch and moves in one motion; --detach visits a commit with no branch at all

beginnerPremium
git checkout: The Old Master Key
🔒

git checkout: The Old Master Key

one legacy word doing two different jobs - read it by its ARGUMENT

beginnerPremium
Fast-forward: The Merge With No Merge Commit
🔒

Fast-forward: The Merge With No Merge Commit

when the other branch continued your line, merge creates nothing - your branch name slides forward to their tip

beginnerPremium