Why knowing how to undo matters in Git - Challenge Your Understanding

Challenge - 5 Problems

🧠 Conceptual

intermediate

Why is it important to know how to undo changes in Git?

Imagine you accidentally committed a file with sensitive information. What is the main reason knowing how to undo changes in Git is crucial?

A To permanently delete the entire project history

B To quickly fix mistakes and avoid pushing wrong changes to the shared repository

C To speed up the commit process by skipping tests

D To automatically merge conflicting branches without review

💡 Hint

Think about what happens if wrong changes get shared with others.

Knowing how to undo changes helps you fix mistakes before they affect others. It prevents errors from spreading and keeps the project clean.

💻 Command Output

intermediate

What is the output of 'git status' after undoing a commit with 'git reset --soft HEAD~1'?

You run git reset --soft HEAD~1 to undo your last commit but keep changes staged. What will git status show next?

Git

git reset --soft HEAD~1
git status

A Untracked files only

B No changes, working directory clean

C Changes to be committed: list of files from last commit

D Merge conflict message

💡 Hint

Soft reset moves HEAD back but keeps changes staged.

The soft reset removes the last commit but keeps the changes staged, so git status shows them ready to commit again.

🔀 Workflow

advanced

Which sequence correctly reverts a pushed commit without rewriting history?

You pushed a commit that introduced a bug. You want to undo it safely without rewriting history. Which command sequence is correct?

A git revert HEAD; git push

B git reset --hard HEAD~1; git push --force

C git checkout HEAD~1; git push

D git reset --soft HEAD~1; git push

💡 Hint

Think about safe ways to undo changes already shared with others.

git revert creates a new commit that undoes the changes, preserving history and avoiding problems for others.

❓ Troubleshoot

advanced

What error occurs if you try to undo a commit with 'git reset --hard' but have uncommitted changes?

You run git reset --hard HEAD~1 but Git refuses and shows an error. What is the likely cause?

A The repository is corrupted

B You are not on a branch, so reset is not allowed

C The HEAD~1 commit does not exist

D Uncommitted changes would be lost, so Git blocks the reset

💡 Hint

Think about what happens to uncommitted work during a hard reset.

A hard reset discards uncommitted changes. Git blocks it to prevent accidental data loss.

✅ Best Practice

expert

Which practice best ensures safe undoing of changes in a shared Git repository?

In a team project, what is the best practice to undo a mistake after pushing commits?

A Create a new commit with <code>git revert</code> to undo the mistake safely

B Use <code>git push --force</code> to rewrite history and fix the mistake

C Delete the remote branch and push a new one

D Reset local branch and never push again

💡 Hint

Consider how to keep history intact for your teammates.

Reverting creates a new commit that undoes changes without rewriting history, which is safer for shared work.

Practice

1. Why is it important to know how to undo changes in Git?

easy

A. To create new branches

B. To fix mistakes and keep the project clean

C. To add more files to the repository

D. To merge two branches

Solution

1. Step 1: Understand the purpose of undoing in Git

   Undoing helps correct errors made during development, preventing unwanted changes from affecting the project.

2. Step 2: Recognize the benefit of a clean project history

   Keeping the project clean means the history is easier to read and maintain, which is important for teamwork and future updates.

3. Final Answer:

   To fix mistakes and keep the project clean -> Option B

4. Quick Check:

   Undoing fixes mistakes [OK]

Hint: Undoing fixes errors and keeps history clean [OK]

Common Mistakes:

• Confusing undo with adding files
• Thinking undo creates branches
• Mixing undo with merging

2. Which Git command unstages files that were added to the staging area by mistake?

easy

A. git commit --amend

B. git checkout <file>

C. git reset HEAD <file>

D. git merge --abort

Solution

1. Step 1: Identify the command to unstage files

   The command git reset HEAD <file> removes files from the staging area without deleting changes.

2. Step 2: Understand why other commands don't unstage

   git commit --amend changes the last commit, git checkout <file> discards changes, and git merge --abort cancels a merge.

3. Final Answer:

   git reset HEAD <file> -> Option C

4. Quick Check:

   Unstage files = git reset HEAD [OK]

Hint: Use git reset HEAD to unstage files [OK]

Common Mistakes:

• Using git commit --amend to unstage
• Confusing checkout with unstaging
• Trying to abort merge to unstage

3. What will be the output of the following commands if you want to discard changes in a file named app.js?

git status
git checkout -- app.js
git status

medium

A. The changes in app.js are discarded and it shows as unmodified

B. The changes are staged for commit

C. The file app.js is deleted from the project

D. The last commit is undone

Solution

1. Step 1: Understand what git checkout -- app.js does

   This command discards local changes in app.js, restoring it to the last committed state.

2. Step 2: Analyze the status before and after

   Before, git status shows changes in app.js. After, it shows no changes because they were discarded.

3. Final Answer:

   The changes in app.js are discarded and it shows as unmodified -> Option A

4. Quick Check:

   Checkout discards changes [OK]

Hint: git checkout -- filename discards local changes [OK]

Common Mistakes:

• Thinking checkout stages changes
• Believing checkout deletes files
• Confusing checkout with undoing commits

4. You accidentally committed a file with sensitive data. Which command helps you undo the last commit but keep the changes in your working directory to fix the file?

medium

A. git checkout HEAD~1

B. git revert HEAD

C. git reset --hard HEAD~1

D. git reset --soft HEAD~1

Solution

1. Step 1: Understand the difference between reset options

   git reset --soft HEAD~1 moves HEAD back one commit but keeps changes staged and in the working directory.

2. Step 2: Why other options don't fit

   git revert HEAD creates a new commit undoing changes, git reset --hard HEAD~1 deletes changes, and git checkout HEAD~1 detaches HEAD without undoing commit properly.

3. Final Answer:

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

4. Quick Check:

   Undo last commit but keep changes = git reset --soft [OK]

Hint: Use git reset --soft to undo commit but keep changes [OK]

Common Mistakes:

• Using --hard and losing changes
• Using revert which adds a new commit
• Using checkout which detaches HEAD

5. You want to undo multiple commits but keep the changes in your working directory to edit them before recommitting. Which sequence of commands achieves this safely?

hard

A. git reset --mixed HEAD~3; git add .; git commit -m "Updated commits"

B. git revert HEAD~3..HEAD; git push

C. git reset --hard HEAD~3; git commit -m "Undo commits"

D. git checkout HEAD~3; git commit -m "Undo commits"

Solution

1. Step 1: Understand what git reset --mixed HEAD~3 does

   This command moves HEAD back 3 commits and unstages changes but keeps them in the working directory for editing.

2. Step 2: Add and recommit after editing

   After editing, git add . stages changes and git commit -m "Updated commits" creates a new commit with the corrected changes.

3. Step 3: Why other options are incorrect

   git revert creates new commits undoing changes, git reset --hard deletes changes, and git checkout detaches HEAD without undoing commits properly.

4. Final Answer:

   git reset --mixed HEAD~3; git add .; git commit -m "Updated commits" -> Option A

5. Quick Check:

   Undo commits but keep changes = git reset --mixed + add + commit [OK]

Hint: Use git reset --mixed to undo commits but keep changes [OK]

Common Mistakes:

• Using git reset --hard and losing work
• Using git revert which adds undo commits
• Using git checkout which detaches HEAD