Reordering commits in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to start an interactive rebase for the last 3 commits.

Git

git rebase -i HEAD~[1]

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

A4

B2

C3

D5

Attempts:

3 left

💡 Hint

Common Mistakes

Using a number too small or too large will rebase the wrong number of commits.

Forgetting the '-i' flag disables interactive mode.

Using 'HEAD~3' tells Git to rebase the last 3 commits interactively.

2fill in blank

medium

Complete the command to reorder commits by editing the rebase todo list.

Git

git rebase -i [1]

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

AHEAD~2

BHEAD~3

CHEAD~4

DHEAD~5

Attempts:

3 left

💡 Hint

Common Mistakes

Choosing the wrong number of commits to rebase.

Not using the interactive flag '-i'.

You specify the commit range to reorder by using HEAD~3 for the last 3 commits.

3fill in blank

hard

Fix the error in the command to reorder the last 4 commits interactively.

Git

git rebase -i HEAD~[1]

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

A2

B5

C3

D4

Attempts:

3 left

💡 Hint

Common Mistakes

Using HEAD~3 instead of HEAD~4.

Omitting the '-i' flag.

To reorder the last 4 commits, you must specify HEAD~4.

4fill in blank

hard

Fill both blanks to reorder commits by changing the order in the todo list and then saving.

Git

git rebase -i HEAD~[1]
# In the editor, change the order of commits and then [2] to apply changes

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

A3

B4

Csave

Dexit

Attempts:

3 left

💡 Hint

Common Mistakes

Not saving the file after editing the commit order.

Using the wrong number of commits in the rebase command.

You start interactive rebase with HEAD~3 and then save the todo list to apply changes.

5fill in blank

hard

Fill all three blanks to reorder commits by starting interactive rebase, editing the todo list, and then confirming the rebase.

Git

git rebase -i HEAD~[1]
# Edit the todo list to reorder commits and then [2]
# After rebase, use git [3] to check commit history

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

A3

Bsave

Clog

Dexit

Attempts:

3 left

💡 Hint

Common Mistakes

Not saving the todo list after editing.

Using 'git status' instead of 'git log' to check commits.

Using the wrong number of commits in the rebase command.

Start with HEAD~3, save the todo list after editing, then check history with git log.

Practice

1. What is the main purpose of using git rebase -i when working with commits?

easy

A. To create a new branch from the current commit

B. To reorder, edit, or squash commits interactively

C. To merge two branches automatically

D. To delete the entire commit history

Solution

1. Step 1: Understand the function of git rebase -i

   This command opens an interactive editor allowing you to reorder, edit, or squash commits.

2. Step 2: Compare with other options

   Creating branches, merging, or deleting history are not the main purposes of this command.

3. Final Answer:

   To reorder, edit, or squash commits interactively -> Option B

4. Quick Check:

   Interactive rebase = reorder commits [OK]

Hint: Use interactive rebase to reorder commits easily [OK]

Common Mistakes:

• Confusing rebase with branch creation
• Thinking rebase deletes history
• Mixing rebase with merge commands

2. Which of the following is the correct command to start an interactive rebase for the last 3 commits?

easy

A. git rebase -i HEAD~3

B. git rebase -i HEAD^3

C. git rebase -i HEAD~

D. git rebase -i HEAD^^3

Solution

1. Step 1: Recall the syntax for interactive rebase

   The correct syntax uses HEAD~N to specify the last N commits, so HEAD~3 means last 3 commits.

2. Step 2: Check other options for syntax errors

   HEAD^3 and HEAD^^3 are invalid for this purpose; HEAD~ is incomplete.

3. Final Answer:

   git rebase -i HEAD~3 -> Option A

4. Quick Check:

   Use HEAD~N for last N commits [OK]

Hint: Use HEAD~N to specify last N commits in rebase [OK]

Common Mistakes:

• Using caret (^) incorrectly for commit range
• Omitting the number after ~
• Confusing HEAD~ with HEAD^

3. Given the following interactive rebase todo list:

pick a1b2c3 Commit A
pick d4e5f6 Commit B
pick 789abc Commit C

If you change it to:

pick d4e5f6 Commit B
pick a1b2c3 Commit A
pick 789abc Commit C

What will be the order of commits after the rebase?

medium

A. Commit B, Commit A, Commit C

B. Commit A, Commit B, Commit C

C. Commit C, Commit B, Commit A

D. Commit A, Commit C, Commit B

Solution

1. Step 1: Understand the todo list order

   The interactive rebase applies commits in the order listed. Changing the order changes commit history order.

2. Step 2: Apply the new order

   New order is Commit B, then Commit A, then Commit C.

3. Final Answer:

   Commit B, Commit A, Commit C -> Option A

4. Quick Check:

   Rebase applies commits in listed order [OK]

Hint: Order commits in todo list to reorder history [OK]

Common Mistakes:

• Assuming original order stays after rebase
• Confusing commit hashes with order
• Ignoring the todo list sequence

4. You ran git rebase -i HEAD~3 and changed the order of commits, but Git shows a conflict error. What is the best way to fix this?

medium

A. Force push the branch without resolving conflicts

B. Abort the rebase with git rebase --abort and try again

C. Delete the .git folder and start over

D. Manually resolve conflicts, then run git rebase --continue

Solution

1. Step 1: Understand rebase conflict handling

   When conflicts occur during rebase, you must manually fix them in files.

2. Step 2: Continue rebase after resolving conflicts

   After fixing conflicts, run git rebase --continue to proceed.

3. Final Answer:

   Manually resolve conflicts, then run git rebase --continue -> Option D

4. Quick Check:

   Fix conflicts + git rebase --continue [OK]

Hint: Fix conflicts, then continue rebase with git rebase --continue [OK]

Common Mistakes:

• Ignoring conflicts and force pushing
• Aborting rebase without trying to fix
• Deleting .git folder which loses repo data

5. You want to reorder the last 4 commits to put the oldest commit last without changing their content. Which sequence of commands correctly achieves this?

hard

A. Run git reset --hard HEAD~4 then cherry-pick commits in new order

B. Run git merge --reorder HEAD~4 to reorder commits automatically

C. Run git rebase -i HEAD~4, then move the first commit line to the bottom in the editor

D. Run git rebase -i HEAD~3 and swap the last two commits

Solution

1. Step 1: Use interactive rebase on last 4 commits

   Running git rebase -i HEAD~4 opens the last 4 commits for editing order.

2. Step 2: Move the oldest commit line to the bottom

   In the editor, reorder lines so the oldest commit is last, preserving content.

3. Final Answer:

   Run git rebase -i HEAD~4, then move the first commit line to the bottom in the editor -> Option C

4. Quick Check:

   Interactive rebase + reorder lines = reorder commits [OK]

Hint: Use interactive rebase and reorder lines to change commit order [OK]

Common Mistakes:

• Using reset which loses commit history
• Trying non-existent git merge --reorder command
• Using wrong commit range in rebase