git rebase basic usage - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to start rebasing the current branch onto the master branch.

Git

git rebase [1]

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

Amerge

Bmaster

Ccommit

Dbranch

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'merge' instead of the branch name causes an error.

Using 'commit' or 'branch' are not valid targets for rebase.

The command git rebase master rebases the current branch onto the master branch, replaying commits on top of master.

2fill in blank

medium

Complete the command to abort an ongoing rebase process.

Git

git rebase --[1]

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

Aabort

Bcontinue

Cskip

Dedit

Attempts:

3 left

💡 Hint

Common Mistakes

Using '--continue' tries to resume the rebase instead of aborting.

Using '--skip' skips the current patch but does not abort the whole rebase.

The command git rebase --abort stops the rebase and returns the branch to its original state before the rebase started.

3fill in blank

hard

Fix the error in the command to rebase interactively starting from the last 3 commits.

Git

git rebase -i HEAD~[1]

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

A5

B2

C4

D3

Attempts:

3 left

💡 Hint

Common Mistakes

Using a number less than 3 will not include all desired commits.

Using a number greater than 3 includes more commits than intended.

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

4fill in blank

hard

Fill both blanks to create a new branch and rebase it onto master.

Git

git checkout -b [1] && git rebase [2]

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

Afeature

Bdevelop

Cmaster

Dmain

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'develop' as the new branch name when the task expects 'feature'.

Rebasing onto 'develop' instead of 'master' changes the base branch.

This sequence creates a new branch called feature and rebases it onto master, updating the feature branch with the latest master changes.

5fill in blank

hard

Fill all three blanks to squash the last two commits into one during an interactive rebase.

Git

git rebase -i HEAD~[1] # change 'pick' to [2] for the second commit and save the [3] file

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

A2

Bsquash

Ceditor

D3

Attempts:

3 left

💡 Hint

Common Mistakes

Using HEAD~3 includes too many commits.

Using 'fixup' instead of 'squash' changes commit messages differently.

Not saving the editor file stops the rebase process.

To squash the last two commits, you start an interactive rebase with HEAD~2, change the second commit's action from 'pick' to 'squash', and save the changes in the editor.

Practice

1. What does the git rebase command primarily do?

easy

A. Deletes all commits from the current branch

B. Merges two branches together with a merge commit

C. Creates a new branch without any commits

D. Moves your commits to a new base commit to create a linear history

Solution

1. Step 1: Understand the purpose of git rebase

   Git rebase moves commits from one base to another to keep history linear and clean.

2. Step 2: Compare with other git commands

   Unlike merge, rebase rewrites commit history without creating merge commits.

3. Final Answer:

   Moves your commits to a new base commit to create a linear history -> Option D

4. Quick Check:

   Rebase = move commits to new base [OK]

Hint: Rebase moves commits to a new base, unlike merge [OK]

Common Mistakes:

• Confusing rebase with merge
• Thinking rebase deletes commits
• Believing rebase creates new branches

2. Which of the following is the correct syntax to rebase your current branch onto main?

easy

A. git rebase --merge main

B. git rebase -m main

C. git rebase main

D. git rebase --onto main

Solution

1. Step 1: Recall basic git rebase syntax

   The command to rebase current branch onto another is git rebase <branch>.

2. Step 2: Identify correct option

   git rebase main matches the correct syntax: git rebase main.

3. Final Answer:

   git rebase main -> Option C

4. Quick Check:

   Rebase syntax = git rebase branch [OK]

Hint: Use 'git rebase branch-name' to rebase current branch [OK]

Common Mistakes:

• Adding unnecessary flags like -m or --merge
• Using --onto without required arguments
• Confusing rebase syntax with merge

3. Given the following commands run in sequence:

git checkout feature
git rebase main

What happens to the commits on feature branch?

medium

A. They are replayed on top of the latest commit on main

B. They are deleted and replaced by main commits

C. They remain unchanged and main is merged

D. They are copied to a new branch named main

Solution

1. Step 1: Understand what 'git rebase main' does on feature branch

   It takes commits from feature and replays them on top of main's latest commit.

2. Step 2: Clarify what happens to commits

   Commits are not deleted but moved to appear after main's commits, creating a linear history.

3. Final Answer:

   They are replayed on top of the latest commit on main -> Option A

4. Quick Check:

   Rebase = replay commits on new base [OK]

Hint: Rebase replays commits on top of target branch [OK]

Common Mistakes:

• Thinking commits get deleted
• Confusing rebase with merge
• Assuming new branches are created

4. You ran git rebase main on your feature branch but got conflicts. What is the correct way to continue after resolving conflicts?

medium

A. Run git rebase --continue

B. Run git merge --continue

C. Run git commit --amend

D. Run git rebase --abort to finish

Solution

1. Step 1: Identify the correct command after resolving rebase conflicts

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

2. Step 2: Differentiate from other commands

   git merge --continue is for merges, git commit --amend edits commits, and git rebase --abort cancels rebase.

3. Final Answer:

   Run git rebase --continue -> Option A

4. Quick Check:

   Fix conflicts then git rebase --continue [OK]

Hint: After conflicts, use 'git rebase --continue' to proceed [OK]

Common Mistakes:

• Using merge commands during rebase
• Aborting rebase instead of continuing
• Trying to amend commits prematurely

5. You rebased your feature branch onto main and now want to update the remote branch. What must you do to push your changes?

hard

A. Use git push normally without flags

B. Use git push --force to overwrite remote history

C. Delete the remote branch and push again

D. Use git push --no-verify to skip hooks

Solution

1. Step 1: Understand effect of rebase on commit history

   Rebase rewrites commit history, so remote branch history differs from local.

2. Step 2: Identify correct push method after rebase

   You must force push with git push --force to update remote branch with rewritten history.

3. Final Answer:

   Use git push --force to overwrite remote history -> Option B

4. Quick Check:

   Rebase requires force push to update remote [OK]

Hint: After rebase, always force push to update remote branch [OK]

Common Mistakes:

• Trying normal push after rebase
• Deleting remote branch unnecessarily
• Using push flags unrelated to rebase