Skip to content
EgyKode
01 · FoundationsLab 7 / 59
Challengegit

Git Recovery & History Surgery — Challenge

Destroy work four different ways and get it back, then remove a secret from history and understand why that is not the fix.

Time
22 min
Level
Intermediate
Objectives
4 objectives
Cost
Free

Where this fits in the platform

This lab adds

  • The ability to recover work you thought you destroyed

Which lets you

Before you start

You will need

  • git 2.30+

You do not need these already — the lab environment below provides them.

You will be able to

  • Recover commits after a hard reset, a deleted branch or a bad rebase
  • Choose between revert, reset and restore deliberately
  • Remove a file from history, and know what that does not achieve

CostFree

— a local repository is enough.

The goal#

Achieve the same outcome as Git Recovery & History Surgery, from an empty starting point, without the steps.

You reset the wrong branch. A colleague force-pushed over your work. There is an API key in a commit from three weeks ago.

All three are recoverable, and knowing that changes how confidently you work.

Hands-on environment

Run this lab in a real terminal, free and in your browser. The environment is temporary and yours alone — break it as much as you like.

Start the challenge

Opens in Killercoda, in a new tab — keep this page open for the steps.

This is the guided lab's environment — the same machine, with its walkthrough on the left. Work from the task above and leave those steps alone until you are done, or you are reading the answers.

Run it on your own machine

Run this lab on your own machine. One command starts the environment, with everything the lab needs already installed:

You will need:

  • git
git clone https://github.com/EgyKode/EgyKode-lab.git
cd EgyKode-lab
./egykode start
./egykode shell

You need Docker and Git installed. Everything else runs inside the environment. The first start downloads it and takes a few minutes; later starts are seconds.

Not sure what you already have? Run: npm run doctor — it checks and changes nothing.

Anything you tick here is your own record. EgyKode cannot see inside that terminal, so the success criteria stay self-assessed even when the environment checks your work for you.

What must be true when you are done

Step 1 of 3

What must be true when you are done#

  • You recovered work after reset --hard, after deleting a branch, and after an aborted rebase.
  • You can state when revert is correct and when reset is.
  • A committed secret is gone from every commit, verified by searching history.
  • You can explain why removing it is still not sufficient.

Rules#

  • Do not open the guided lab until you are finished, or until the same problem has held you up for 20 minutes.
  • Documentation is allowed and encouraged.
  • Verify every criterion with a command whose output you can read.

If you get stuck#

  1. What did you expect, exactly?
  2. What happened instead — the error text, not a paraphrase?
  3. Which layer is that error from?
  4. What is the smallest command that proves the layer below is fine?

You are done when

0 of 4

The concept behind it

Stuck?Open the guided lab

Next up

Lab 7 of 59 on the project path

Professional Collaboration on GitHubProtect a branch, require review, and make the pipeline the thing that decides whether code can merge.45 minIntermediate