learngit

Levels need a desktop

A level is you typing real Git commands and editing files while the commit graph moves under you, all on one screen. That needs a keyboard and room for three columns.

Conflicts · level 5.2Take one side

Open it on a laptop and you will be rebasing within the hour.

learngit
18 / 33
0 XP

Working directory

working tree cleannothing differs from the last commit
Unchanged1
config.js
A addedM modifiedU untrackedD deleted
{ }select a file to edit
commit graph
↑ history · tab complete · ⌘Z undo

Take one side

+0 XP

During a merge, "ours" is the branch you are standing on. Remember that phrasing, because during a rebase it flips, because Git replays your commits onto the other branch, so the branch you are standing on becomes "theirs".

Next level →