Recovering from bad rebase in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to abort a bad rebase and return to the previous state.

Git

git rebase [1]

Drag options to blanks, or click blank then click option'

A--abort

B--continue

C--skip

D--edit-todo

Attempts:

3 left

💡 Hint

Common Mistakes

Using --continue continues the rebase instead of aborting.

Using --skip skips a commit but does not abort the whole rebase.

Using git rebase --abort stops the rebase and resets your branch to the state before the rebase started.

2fill in blank

medium

Complete the command to view the reflog, which helps find previous commit states after a bad rebase.

Git

git [1]

Drag options to blanks, or click blank then click option'

Astatus

Blog

Creflog

Dbranch

Attempts:

3 left

💡 Hint

Common Mistakes

Using git log shows commits but not the HEAD movement history.

git status shows current state but not history.

git reflog shows a history of where your HEAD and branches have been, useful to recover lost commits.

3fill in blank

hard

Fix the command to reset your branch to a previous commit found in reflog after a bad rebase.

Git

git reset --hard [1]

Drag options to blanks, or click blank then click option'

Aorigin/main

BHEAD@{3}

CHEAD~2

Dmaster

Attempts:

3 left

💡 Hint

Common Mistakes

Using HEAD~2 resets to two commits before current, which may not be the correct recovery point.

Using origin/main resets to remote branch, not local reflog state.

HEAD@{3} refers to the state of HEAD three moves ago in the reflog, useful to recover before the bad rebase.

4fill in blank

hard

Fill both blanks to create a new branch from a previous commit to save work before fixing a bad rebase.

Git

git checkout -b [1] [2]

Drag options to blanks, or click blank then click option'

Arecovery-branch

BHEAD

CHEAD@{1}

Dmain

Attempts:

3 left

💡 Hint

Common Mistakes

Using HEAD instead of HEAD@{1} may not point to the desired previous state.

Using main as the commit reference does not help recover the bad rebase state.

Create a new branch named recovery-branch from the previous HEAD state HEAD@{1} to preserve work before fixing the rebase.

5fill in blank

hard

Fill all three blanks to reset your current branch to a previous commit and force push to update the remote after a bad rebase.

Git

git reset --hard [1] && git push [2] [3]

Drag options to blanks, or click blank then click option'

AHEAD@{2}

Borigin

C--force

Dmain

Attempts:

3 left

💡 Hint

Common Mistakes

Forgetting to use --force causes push to be rejected after rewriting history.

Using main instead of origin in push command is incorrect syntax.

Reset to the previous HEAD state HEAD@{2}, then force push to origin with --force to update the remote branch after fixing the bad rebase.

Practice

1. What is the safest way to stop a rebase process if you realize it is going wrong?

easy

A. Use git rebase --abort to cancel the rebase

B. Use git reset --hard HEAD to cancel the rebase

C. Use git commit --amend to fix the rebase

D. Use git push --force to undo the rebase

Solution

1. Step 1: Understand the rebase abort command

   The command git rebase --abort safely stops and cancels the ongoing rebase process, restoring the branch to its original state before the rebase started.

2. Step 2: Compare with other commands

   Other commands like git reset --hard HEAD or git commit --amend do not cancel a rebase safely. git push --force is for pushing changes, not aborting rebase.

3. Final Answer:

   Use git rebase --abort to cancel the rebase -> Option A

4. Quick Check:

   Cancel rebase safely = git rebase --abort [OK]

Hint: Abort rebase with git rebase --abort to safely cancel [OK]

Common Mistakes:

• Using git reset --hard HEAD which may lose changes
• Trying to amend commits during rebase to fix errors
• Forcing push without fixing rebase issues

2. Which of the following commands correctly shows the history of recent HEAD positions to help recover from a bad rebase?

easy

A. git reflog

B. git branch -a

C. git status

D. git log --oneline

Solution

1. Step 1: Identify the command to view HEAD history

   git reflog shows a log of where HEAD and branches have pointed recently, including before and after rebases.

2. Step 2: Understand why other commands don't help here

   git log --oneline shows commit history but not HEAD movements. git status shows current state. git branch -a lists branches.

3. Final Answer:

   git reflog -> Option A

4. Quick Check:

   View HEAD history = git reflog [OK]

Hint: Use git reflog to find commits before rebase [OK]

Common Mistakes:

• Using git log which doesn't show HEAD moves
• Confusing git status with reflog
• Looking at branches instead of commit history

3. After a bad rebase, you find the commit hash abc1234 from git reflog. What does the command git reset --hard abc1234 do?

medium

A. Creates a new branch at commit abc1234

B. Moves the current branch to commit abc1234 and discards all changes after it

C. Starts a new rebase from commit abc1234

D. Shows the differences between HEAD and abc1234

Solution

1. Step 1: Understand git reset --hard with a commit

   The command git reset --hard abc1234 moves the current branch pointer to the commit abc1234 and resets the working directory and index to match that commit, discarding any changes after it.

2. Step 2: Clarify what the other options do not do

   This command does not create a new branch, start a rebase, or show differences. It forcibly resets the branch state.

3. Final Answer:

   Moves branch to abc1234 and discards later changes -> Option B

4. Quick Check:

   Reset hard to commit = move branch and discard changes [OK]

Hint: Reset hard to commit to undo bad rebase changes [OK]

Common Mistakes:

• Thinking reset creates a new branch
• Confusing reset with diff or rebase commands
• Using reset without knowing it discards changes

4. You started a rebase but got conflicts and want to cancel it. You run git reset --hard HEAD instead of git rebase --abort. What is the likely result?

medium

A. The rebase is safely canceled and branch restored

B. The rebase continues but changes are lost

C. The working directory resets but rebase metadata remains, causing issues

D. Git shows an error and stops

Solution

1. Step 1: Understand difference between reset and rebase abort

   git reset --hard HEAD resets files but does not clear rebase state files, so the rebase process is still active.

2. Step 2: Consequence of not aborting rebase properly

   This causes Git to think rebase is ongoing, leading to confusion and possible errors until git rebase --abort is run.

3. Final Answer:

   Working directory resets but rebase metadata remains, causing issues -> Option C

4. Quick Check:

   Reset hard ≠ abort rebase; rebase metadata stays [OK]

Hint: Always use git rebase --abort to cancel rebase, not reset [OK]

Common Mistakes:

• Using reset hard to cancel rebase
• Assuming reset clears rebase state
• Ignoring rebase metadata files causing errors

5. You performed a bad rebase and want to recover your branch to the state before the rebase started. Which sequence of commands correctly recovers your branch?

hard

A. git checkout master -> git merge --abort

B. git reset --hard HEAD~1 -> git rebase --abort

C. git rebase --continue -> git reset --soft HEAD~1

D. git reflog -> find commit before rebase -> git reset --hard <commit>

Solution

1. Step 1: Use git reflog to find the commit before the bad rebase

   git reflog lists recent HEAD positions, so you can identify the commit hash before the rebase started.

2. Step 2: Reset branch to that commit to undo the bad rebase

   Using git reset --hard <commit> moves the branch pointer back and resets files to that safe commit, effectively undoing the bad rebase.

3. Final Answer:

   git reflog -> find commit before rebase -> git reset --hard <commit> -> Option D

4. Quick Check:

   Recover bad rebase = reflog + reset hard [OK]

Hint: Find pre-rebase commit with reflog, then reset hard to it [OK]

Common Mistakes:

• Trying to abort after rebase finished
• Using reset soft which keeps changes
• Confusing merge abort with rebase abort