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.