Why recovery skills are critical in Git - See It in Action

Why Recovery Skills Are Critical in Git

📖 Scenario: Imagine you are working on a project with Git. Sometimes, mistakes happen like deleting files or committing wrong changes. Knowing how to recover from these mistakes quickly is very important to keep your work safe and avoid losing progress.

🎯 Goal: You will learn basic Git recovery commands to undo mistakes and restore your project to a good state.

📋 What You'll Learn

Create a Git repository with a file

Make a commit with the file

Simulate a mistake by deleting the file

Use Git commands to recover the deleted file

Display the recovered file content

💡 Why This Matters

🌍 Real World

In real projects, mistakes like deleting files or committing wrong changes happen often. Knowing how to recover quickly saves time and prevents data loss.

💼 Career

Git recovery skills are essential for developers, DevOps engineers, and anyone working with version control to maintain code integrity and fix errors efficiently.

1

Create a Git repository and add a file

Initialize a Git repository with git init. Create a file named notes.txt with the content Hello Git. Add the file to Git with git add notes.txt and commit it with the message Initial commit using git commit -m "Initial commit".

Git

# Initialize Git repo and add notes.txt
# Your code here

Hint

Use git init to start a repo. Use echo to create the file. Then add and commit.

2

Simulate a mistake by deleting the file

Delete the file notes.txt using rm notes.txt. Check the Git status with git status to see the file is deleted but not committed yet.

Git

git init

echo "Hello Git" > notes.txt

git add notes.txt

git commit -m "Initial commit"

# Delete notes.txt and check git status
# Your code here

Hint

Use rm to delete the file. Then run git status to see the change.

3

Recover the deleted file using Git

Use git checkout -- notes.txt to restore the deleted file from the last commit. This recovers your file without losing any work.

Git

git init

echo "Hello Git" > notes.txt

git add notes.txt

git commit -m "Initial commit"

rm notes.txt

git status

# Recover notes.txt using git checkout
# Your code here

Hint

Use git checkout -- filename to restore a deleted file from the last commit.

4

Display the recovered file content

Use cat notes.txt to display the content of the recovered file and confirm it says Hello Git.

Git

git init

echo "Hello Git" > notes.txt

git add notes.txt

git commit -m "Initial commit"

rm notes.txt

git status

git checkout -- notes.txt

# Show the content of notes.txt
# Your code here

Hint

Use cat filename to see the file content in the terminal.

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