git merge command - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

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

Git

git [1] feature

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

Amerge

Bbranch

Ccheckout

Dcommit

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'checkout' instead of 'merge' to combine branches.

Confusing 'commit' with 'merge'.

The git merge command combines the changes from the specified branch into the current branch.

2fill in blank

medium

Complete the command to merge the branch 'dev' into the current branch and create a merge commit even if fast-forward is possible.

Git

git merge --[1] dev

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

Ano-ff

Bff-only

Csquash

Dno-commit

Attempts:

3 left

💡 Hint

Common Mistakes

Using '--ff-only' which only allows fast-forward merges.

Confusing '--no-commit' with '--no-ff'.

The --no-ff option forces Git to create a merge commit even if the merge could be done with a fast-forward.

3fill in blank

hard

Fix the error in the command to merge branch 'release' into the current branch.

Git

git [1] release

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

Amerg

Bmerges

Cmerger

Dmerge

Attempts:

3 left

💡 Hint

Common Mistakes

Misspelling 'merge' as 'merg' or 'merger'.

Adding an unnecessary 's' at the end.

The correct command is git merge release. The other options are misspelled.

4fill in blank

hard

Fill both blanks to merge the branch 'hotfix' into the current branch without committing immediately.

Git

git merge [1] --[2]

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

Ahotfix

Bno-commit

Cno-ff

Dfeature

Attempts:

3 left

💡 Hint

Common Mistakes

Using the wrong branch name.

Confusing '--no-commit' with '--no-ff'.

Use git merge hotfix --no-commit to merge changes but pause before creating a commit.

5fill in blank

hard

Fill all three blanks to merge branch 'test' into the current branch with a custom commit message and no fast-forward.

Git

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

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

Atest

Bno-ff

CMerged test branch

Dfeature

Attempts:

3 left

💡 Hint

Common Mistakes

Using the wrong branch name.

Forgetting to disable fast-forward when a merge commit is desired.

Not providing a commit message with -m.

This command merges the 'test' branch with no fast-forward and adds a custom commit message.