World 2: Undo Magic · Boss challenge

Escape room: 6 disasters

You will learn: to fix six Git disasters in a row, without panic.

The problem

Six Git disasters. One locked room. Fix them all to escape!

Watch

~/diary $ git statusOn branch mainChanges to be committed:  (use "git restore --staged <file>..." to unstage)        modified:   index.html        new file:   secret.txt

Each room is a real terminal. Stuck? Try git status first. After 2 tries, a hint appears. Mistakes are free, so experiment!

Try it

Fix each disaster to unlock the next room.

Disaster 1 of 6: Wrong file staged

secret.txt jumped into the box. Take it out. Keep index.html in.

Working folder

Empty

Staging area

Repository

3 save points
Add style
Add day 1 page
Add README

Hint

Read each room’s note. Then git status or git log --oneline.

Check

A bad commit is already shared. Which fix is safe?

Check

Which mistake can the reflog NOT fix?

You did it!

You can now escape almost any Git disaster.