Round: 01/8
Lives: 3 lives left
Score: 0000
Best: --

Git Untangle

Branches everywhere, a merge conflict blocking the launch. Pick the right commands to ship clean.

Git Untangle

Eight small repos, each with a goal: save a fix, ship a branch, pull before you push, park work with stash, rebase into a straight line, solve a merge conflict. Read the branch graph, pick the next real Git command, and watch the graph change.

8 repos
Git

How to play

Read the repo. The graph shows commits (newest on top), branches, HEAD and origin, the copy on GitHub. Below it: staged and changed files.
Pick the command. Four commands per step, one is right: status, add, commit, switch, merge, rebase, pull, push, stash… Keys 1 to 4 work too.
Learn from Git. A wrong command costs one of 3 lives and tells you what Git would really answer. Then try again.
Score. 100 per first-try step, ×2 after 3 in a row, ×3 after 6. A round with no mistakes adds 50.

Quick tips

Read where HEAD is. Merges and commits land on the branch you're on. Switch first, then merge.
Add, then commit. git add picks the changes, git commit saves them. commit -a does both for files Git already tracks.
Pull before you push. If GitHub has commits you don't, push is rejected. Pull (or pull --rebase) first.
Stash, don't commit half work. git stash clears the folder so you can switch or pull; git stash pop brings your work back.
Conflicts are just a choice. Edit the file, keep the right lines, delete the markers, then add and commit.