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.1Your first conflict

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

learngit
17 / 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

Your first conflict

+0 XP

A conflict is not an error. Git marked the two candidate versions and handed the decision back to you. git add is how you say "this one is settled", which is why the same command both stages and resolves.

Next level →