Squashing 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'

A3

B4

C2

D5

Attempts:

3 left

💡 Hint

Common Mistakes

Using the wrong number after HEAD~

Forgetting the -i flag for interactive mode

The command git rebase -i HEAD~3 opens an interactive rebase for the last 3 commits, allowing you to squash them.

2fill in blank

medium

Complete the command to squash the current commit into the previous one during interactive rebase.

Git

In the editor, replace 'pick' with '[1]' for the commit to squash.

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

Afixup

Bdrop

Cedit

Dsquash

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'fixup' when you want to edit the message

Using 'edit' which pauses rebase for changes

Replacing 'pick' with 'squash' combines the commit with the previous one and allows editing the commit message.

3fill in blank

hard

Fix the error in the command to abort an ongoing rebase.

Git

git rebase --[1]

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

Areset

Bcontinue

Cabort

Dskip

Attempts:

3 left

💡 Hint

Common Mistakes

Using '--continue' instead of '--abort'

Using '--skip' which skips the current patch

The command git rebase --abort stops the rebase and returns to the original state.

4fill in blank

hard

Fill both blanks to create a new commit message during squash.

Git

After squashing, edit the message and save with [1] then exit with [2].

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

A:wq

B:q!

C:w

D:x

Attempts:

3 left

💡 Hint

Common Mistakes

Using ':q!' which discards changes

Using ':w' without quitting

In the editor, :wq writes (saves) and quits, and :x also saves and exits. Both are valid ways to save the commit message and exit.

5fill in blank

hard

Fill all three blanks to squash commits and push changes safely.

Git

git rebase -i HEAD~[1] && git push origin [2] --[3]

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

A3

Bmain

Cforce-with-lease

Dmaster

Attempts:

3 left

💡 Hint

Common Mistakes

Using '--force' instead of '--force-with-lease'

Pushing to wrong branch name

Use HEAD~3 to rebase last 3 commits, push to branch main, and use --force-with-lease to safely force push after rewriting history.