git rebase basic usage - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

What is the output of this git rebase command?

You have a branch feature that is behind main. You run git rebase main while on feature. What happens?

A The commits from <code>feature</code> are replayed on top of the latest <code>main</code> branch commits.

B The <code>main</code> branch is reset to the state of <code>feature</code> branch.

C The <code>feature</code> branch is merged into <code>main</code> creating a merge commit.

D The <code>feature</code> branch is deleted and replaced by <code>main</code> branch.

💡 Hint

Think about what rebasing does: it moves your branch commits to a new base.

Running git rebase main while on feature takes the commits unique to feature and replays them on top of the latest main commits. This updates feature to include all changes from main without a merge commit.

🧠 Conceptual

intermediate

What does git rebase -i allow you to do?

Choose the best description of what interactive rebase (git rebase -i) enables.

A It automatically merges two branches without conflicts.

B It allows you to edit, reorder, squash, or remove commits before applying them.

C It deletes the current branch and creates a new one.

D It pushes commits directly to the remote repository.

💡 Hint

Interactive means you can choose what to do with each commit.

git rebase -i opens a list of commits allowing you to change their order, combine commits (squash), edit commit messages, or remove commits before replaying them.

❓ Troubleshoot

advanced

You get a conflict during a git rebase. What is the correct next step?

During git rebase main, Git stops and shows a conflict. What should you do next?

A Run <code>git rebase --abort</code> to ignore the conflict and keep changes.

B Run <code>git merge main</code> to resolve the conflict automatically.

C Delete the branch and start over.

D Fix the conflicting files manually, then run <code>git rebase --continue</code>.

💡 Hint

Rebase pauses for conflicts so you can fix them.

When a conflict occurs during rebase, you must manually fix the conflicting files. After fixing, you run git rebase --continue to proceed. Aborting cancels the rebase, and merging is a different operation.

✅ Best Practice

advanced

When is it best to avoid using git rebase?

Choose the situation where using git rebase is NOT recommended.

A When you want to clean up your commit history before merging.

B When you want to update your feature branch with the latest main branch commits.

C When you have already pushed your branch to a shared remote repository used by others.

D When you want to combine multiple commits into one.

💡 Hint

Rebasing rewrites history which can confuse others if shared.

Rebasing rewrites commit history. If you rebase commits that others have already pulled, it can cause confusion and conflicts. It's safer to avoid rebasing shared branches.

🔀 Workflow

expert

What is the correct sequence to update a feature branch with the latest main branch changes using rebase?

Order these commands to properly update your feature branch with changes from main using rebase.

A 2,1,3,4

B 1,3,2,4

C 1,2,3,4

D 2,3,1,4

💡 Hint

First get latest remote changes, then switch branch, rebase, and push.

First, git fetch origin updates remote tracking branches. Then, switch to your feature branch with git checkout feature. Next, rebase your feature branch onto the updated origin/main with git rebase origin/main. Finally, push your rebased branch with git push --force-with-lease to update the remote safely.

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