When to rebase vs when to merge in Git - Interactive Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to update your feature branch with the latest changes from main using rebase.

Git

git checkout feature-branch
git [1] main

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

Apush

Bmerge

Ccommit

Drebase

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'merge' here creates a merge commit instead of rebasing.

Using 'commit' or 'push' does not update your branch with main.

Use git rebase main to replay your feature branch commits on top of the latest main branch commits.

2fill in blank

medium

Complete the command to combine changes from a feature branch into main using merge.

Git

git checkout main
git [1] feature-branch

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

Amerge

Bpull

Cfetch

Drebase

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'rebase' here would replay main commits onto feature-branch, not merge.

Using 'pull' or 'fetch' does not merge branches.

Use git merge feature-branch to combine the feature branch changes into main, preserving history.

3fill in blank

hard

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

Git

git checkout feature-branch
git [1] origin/main

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

Acommit

Bmerge

Crebase

Dpush

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'merge' instead of 'rebase' causes a merge commit.

Using 'commit' or 'push' does not update the branch.

The correct command is git rebase origin/main to rebase your local feature branch onto the remote main branch.

4fill in blank

hard

Fill both blanks to create a new branch and switch to it before rebasing.

Git

git [1] new-feature

git checkout [2]

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

Abranch

Bfeature-branch

Cnew-feature

Dcheckout

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'checkout' instead of 'branch' to create a branch.

Switching to a branch name that was not created.

First, create the branch with git branch new-feature, then switch to it with git checkout new-feature.

5fill in blank

hard

Fill all three blanks to create a merge commit with a message after merging feature-branch into main.

Git

git checkout [1]
git merge [2] -m "[3]"

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

Amain

Bfeature-branch

CMerge feature-branch into main

Drebase

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'rebase' instead of 'merge' for combining branches.

Merging into the wrong branch.

Switch to main, merge feature-branch with a message describing the merge.