TechSkribbleBuy
beginnerFree

Merge Conflict: Git Asking a Question

both branches changed the same lines to different results - git writes both versions into the file and waits for your ruling

Merge Conflict: Git Asking a Question

Watch

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

0:00 / 5:07

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