Why recovery skills are critical in Git - Why It Works

Introduction

Mistakes happen when working with code. Recovery skills help you fix errors quickly without losing work or causing delays.

When you accidentally delete important code changes

When you commit wrong files or incomplete work

When you want to undo a bad merge or rebase

When you need to restore a previous stable version after a bug

When you want to explore changes safely without risking your main code

Commands

Shows a history of all recent changes to your branches and HEAD, helping you find lost commits.

Terminal

git reflog

Expected Output

abc1234 HEAD@{0}: commit: Fix typo in README

def5678 HEAD@{1}: commit: Add login feature

789abcd HEAD@{2}: checkout: moving from main to feature-branch

Resets your current branch to the commit abc1234, discarding all changes after it. Use this to undo unwanted commits.

Terminal

git reset --hard abc1234

Expected Output

No output (command runs silently)

→

--hard - Discard all changes in working directory and index

Creates a new branch named recovery-branch at commit abc1234 to safely work on recovering lost changes.

Terminal

git checkout -b recovery-branch abc1234

Expected Output

Switched to a new branch 'recovery-branch'

→

-b - Create and switch to a new branch

Key Concept

If you remember nothing else from this pattern, remember: git keeps a history of all changes that lets you recover lost work safely.

Common Mistakes

Using git reset --hard without checking the commit hash

This can permanently delete changes you wanted to keep.

Always use git reflog to find the correct commit before resetting.

Not creating a recovery branch before experimenting

You risk losing important commits if you work directly on main or master.

Create a new branch to try recovery steps safely.

Summary

Use git reflog to see all recent changes and find lost commits.

Use git reset --hard with care to undo unwanted commits.

Create a new branch to safely recover and test fixes without affecting main code.

Practice

1. Why are recovery skills important when using git?

easy

A. They speed up the commit process

B. They help fix mistakes without losing work

C. They automatically merge branches

D. They delete old branches permanently

Solution

1. Step 1: Understand the purpose of recovery skills

   Recovery skills allow you to undo or fix errors safely in your code history.

2. Step 2: Identify the benefit of recovery skills

   They prevent loss of work by enabling you to restore previous states or undo changes.

3. Final Answer:

   They help fix mistakes without losing work -> Option B

4. Quick Check:

   Recovery skills = Fix mistakes safely [OK]

Hint: Recovery means fixing errors without losing code [OK]

Common Mistakes:

• Thinking recovery speeds commits
• Confusing recovery with merging
• Believing recovery deletes branches

2. Which git command is used to view the history of changes including those not on any branch?

easy

A. git revert

B. git reset

C. git reflog

D. git status

Solution

1. Step 1: Identify command purpose

   git reflog shows a log of all changes to HEAD, including commits that are no longer referenced by branches.

2. Step 2: Compare with other commands

   git reset changes HEAD, git revert creates new commits to undo changes, and git status shows current state.

3. Final Answer:

   git reflog -> Option C

4. Quick Check:

   History including lost commits = git reflog [OK]

Hint: Use reflog to see all HEAD changes, even lost commits [OK]

Common Mistakes:

• Using git reset to view history
• Confusing git revert with reflog
• Thinking git status shows past commits

3. What is the output of the following commands sequence?

git commit -m "First"
git commit -m "Second"
git reset --soft HEAD~1
git status

medium

A. Shows no changes to commit, working tree clean

B. Shows unstaged changes from the "Second" commit

C. Shows an error about HEAD~1

D. Shows staged changes from the "Second" commit

Solution

1. Step 1: Understand git reset --soft HEAD~1

   This command moves HEAD back one commit but keeps changes from that commit staged.

2. Step 2: Check git status after reset

   Since changes are staged, git status will show them ready to commit.

3. Final Answer:

   Shows staged changes from the "Second" commit -> Option D

4. Quick Check:

   Soft reset = staged changes [OK]

Hint: Soft reset keeps changes staged for commit [OK]

Common Mistakes:

• Thinking reset deletes changes
• Confusing staged and unstaged changes
• Expecting error from HEAD~1

4. You accidentally deleted your branch with git branch -D feature. Which command helps you recover it?

medium

A. git reflog

B. git revert feature

C. git reset feature

D. git checkout -b feature

Solution

1. Step 1: Understand branch deletion impact

   Deleting a branch removes its reference but commits remain in reflog temporarily.

2. Step 2: Use git reflog to find commit

   git reflog shows recent HEAD movements, allowing you to find the commit hash to restore the branch.

3. Step 3: Restore branch with commit hash

   After finding the commit, use git branch feature <commit-hash> to recover the branch.

4. Final Answer:

   git reflog -> Option A

5. Quick Check:

   Recover deleted branch = git reflog [OK]

Hint: Use reflog to find lost commits and restore branches [OK]

Common Mistakes:

• Trying git revert on deleted branch
• Using git reset without commit hash
• Creating branch without commit reference

5. You committed a change but realize it breaks the build. You want to undo the commit but keep your changes to fix them. Which sequence is best?

hard

A. git reset --soft HEAD~1

B. git reset --hard HEAD~1

C. git checkout -- .

D. git revert HEAD; git commit -m "fix"

Solution

1. Step 1: Understand the goal

   You want to undo the last commit but keep the changes staged to fix and recommit.

2. Step 2: Analyze options

   git reset --soft HEAD~1 moves HEAD back but keeps changes staged. git revert creates a new commit undoing changes, git reset --hard deletes changes, and git checkout -- . discards changes.

3. Final Answer:

   git reset --soft HEAD~1 -> Option A

4. Quick Check:

   Undo commit but keep changes staged = soft reset [OK]

Hint: Soft reset undoes commit but keeps changes staged [OK]

Common Mistakes:

• Using hard reset and losing changes
• Revert creates extra commits
• Checkout discards all changes