Rebase vs merge mental model in Git - Interactive Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to merge branch 'feature' into the current branch.

Git

git [1] feature

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

Amerge

Brebase

Ccheckout

Dcommit

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'rebase' instead of 'merge' when you want to preserve history.

The git merge command combines the changes from the 'feature' branch into the current branch, preserving the history.

2fill in blank

medium

Complete the command to rebase the current branch onto 'main'.

Git

git [1] main

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

Acheckout

Brebase

Cmerge

Dreset

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'merge' when you want a linear history.

The git rebase command moves the current branch commits on top of the 'main' branch, rewriting history for a linear sequence.

3fill in blank

hard

Fix the error in the command to rebase 'feature' branch onto 'main'.

Git

git checkout feature
git [1] main

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

Amerge

Bpush

Ccommit

Drebase

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'merge' instead of 'rebase' after checkout.

After switching to 'feature', use git rebase main to move its commits on top of 'main'.

4fill in blank

hard

Fill both blanks to create a new branch 'feature' from 'main' and rebase it onto 'main'.

Git

git [1] feature main
git checkout feature
git [2] main

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

Abranch

Bmerge

Crebase

Dcommit

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'merge' to create a branch or 'commit' instead of rebase.

First, create the branch with git branch feature main, then switch and rebase it with git rebase main.

5fill in blank

hard

Fill all three blanks to merge 'feature' into 'main' and then delete 'feature' branch.

Git

git checkout [1]
git [2] feature
git branch -d [3]

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

Afeature

Bmerge

Dmain

Attempts:

3 left

💡 Hint

Common Mistakes

Deleting the wrong branch or merging into the wrong branch.

Switch to 'main', merge 'feature' into it, then delete 'feature' branch safely.

Practice

1. What is the main difference between git merge and git rebase?

easy

A. git merge rewrites commit messages; git rebase preserves commit messages.

B. git merge deletes the source branch; git rebase deletes the target branch.

C. git merge only works on remote branches; git rebase only works on local branches.

D. git merge combines histories preserving all commits; git rebase rewrites history to create a linear sequence.

Solution

1. Step 1: Understand git merge behavior

   git merge combines two branches by creating a new commit that preserves the history of both branches without changing existing commits.

2. Step 2: Understand git rebase behavior

   git rebase moves or reapplies commits from one branch onto another, rewriting history to make it look like a straight line.

3. Final Answer:

   git merge combines histories preserving all commits; git rebase rewrites history to create a linear sequence. -> Option D

4. Quick Check:

   Merge preserves history, rebase rewrites it [OK]

Hint: Merge keeps history; rebase rewrites it linearly [OK]

Common Mistakes:

• Thinking merge deletes branches
• Believing rebase only works on remote branches
• Confusing which command rewrites history

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

easy

A. git rebase main

B. git merge main

C. git rebase origin/main

D. git checkout main && git rebase

Solution

1. Step 1: Identify the command to rebase current branch

   The command git rebase main rebases the current branch onto the main branch.

2. Step 2: Check other options for correctness

   git merge main merges, not rebases; git rebase origin/main rebases onto remote tracking branch which may be outdated; git checkout main && git rebase is invalid syntax.

3. Final Answer:

   git rebase main -> Option A

4. Quick Check:

   Rebase current branch onto main = git rebase main [OK]

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

Common Mistakes:

• Using merge instead of rebase
• Rebasing onto remote branch without fetching
• Incorrect chaining of commands

3. Given the following commands executed in order on branch feature:

git checkout feature
git rebase main
git log --oneline --graph

What will the commit history look like compared to using git merge main instead?

medium

A. A linear history with feature commits on top of main commits.

B. A merge commit combining main and feature histories.

C. No change in history; feature branch remains separate.

D. Feature branch commits are deleted.

Solution

1. Step 1: Understand effect of git rebase main on feature branch

   Rebasing moves feature commits to be based on the latest main commits, creating a straight, linear history.

2. Step 2: Compare with git merge main effect

   Merging creates a new merge commit that combines histories, preserving the branch structure and showing a branch point.

3. Final Answer:

   A linear history with feature commits on top of main commits. -> Option A

4. Quick Check:

   Rebase = linear history; merge = merge commit [OK]

Hint: Rebase = linear history; merge = merge commit [OK]

Common Mistakes:

• Thinking rebase creates merge commits
• Believing history stays unchanged after rebase
• Assuming commits are deleted after rebase

4. You ran git rebase main on your feature branch but got conflicts. After resolving conflicts, which command should you run to continue the rebase?

medium

A. git commit -m 'resolved conflicts'

B. git merge --continue

C. git rebase --continue

D. git rebase --abort

Solution

1. Step 1: Identify the correct command to continue rebase after conflicts

   After resolving conflicts during a rebase, git rebase --continue tells Git to proceed with applying remaining commits.

2. Step 2: Understand other options

   git merge --continue is for merge conflicts, not rebase; git commit -m is manual commit but rebase expects --continue; git rebase --abort cancels the rebase.

3. Final Answer:

   git rebase --continue -> Option C

4. Quick Check:

   Continue rebase after conflicts = git rebase --continue [OK]

Hint: Use 'git rebase --continue' after resolving conflicts [OK]

Common Mistakes:

• Using merge commands during rebase
• Trying to commit manually instead of continuing
• Aborting instead of continuing rebase

5. You want to update your feature branch with the latest changes from main but keep a clean, linear history without merge commits. Which sequence of commands achieves this safely?

hard

A. git checkout feature; git merge origin/main

B. git checkout feature; git fetch origin; git rebase origin/main

C. git checkout main; git pull; git checkout feature; git merge main

D. git checkout feature; git pull origin main

Solution

1. Step 1: Fetch latest changes from remote main branch

   git fetch origin updates local remote tracking branches without changing working branches.

2. Step 2: Rebase feature branch onto updated origin/main

   git rebase origin/main reapplies feature commits on top of latest main commits, keeping history linear and clean.

3. Final Answer:

   git checkout feature; git fetch origin; git rebase origin/main -> Option B

4. Quick Check:

   Fetch then rebase for clean update [OK]

Hint: Fetch first, then rebase onto remote main for clean history [OK]

Common Mistakes:

• Merging instead of rebasing for linear history
• Pulling directly on feature branch causing merge commits
• Not fetching latest remote changes before rebase