Merge commit creation in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

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

Git

git merge [1]

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

Acommit

Bfeature

Ccheckout

Dpush

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'commit' instead of the branch name.

Confusing 'checkout' with 'merge'.

Trying to 'push' instead of merging.

The git merge feature command merges the 'feature' branch into your current branch, creating a merge commit if needed.

2fill in blank

medium

Complete the command to create a merge commit even if the merge could be fast-forwarded.

Git

git merge --[1] feature

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

Asquash

Bno-commit

Cno-ff

Dabort

Attempts:

3 left

💡 Hint

Common Mistakes

Using '--no-commit' which prevents committing the merge.

Using '--squash' which combines commits without a merge commit.

Using '--abort' which cancels the merge.

The --no-ff option forces Git to create a merge commit even if a fast-forward merge is possible.

3fill in blank

hard

Fix the error in the command to merge branch 'dev' into current branch with a merge commit.

Git

git merge [1] --no-ff

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

Adev

B--no-ff

Ccommit

Dmerge

Attempts:

3 left

💡 Hint

Common Mistakes

Putting options before the branch name.

Using 'merge' or 'commit' as branch names.

The branch name 'dev' should come right after git merge. Options like --no-ff come after the branch name.

4fill in blank

hard

Fill both blanks to create a merge commit with a custom message 'Merge feature branch'.

Git

git merge [1] -m [2]

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

Afeature

B"Merge feature branch"

C"Merge commit"

Ddevelop

Attempts:

3 left

💡 Hint

Common Mistakes

Using the wrong branch name.

Not quoting the message properly.

The command merges the 'feature' branch and uses -m to add a custom message for the merge commit.

5fill in blank

hard

Fill all three blanks to merge 'hotfix' branch with no fast-forward and a custom message 'Hotfix merge'.

Git

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

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

Ahotfix

B--no-ff

C"Hotfix merge"

D--squash

Attempts:

3 left

💡 Hint

Common Mistakes

Using '--squash' which does not create a merge commit.

Not quoting the message.

Putting options in the wrong order.

This command merges the 'hotfix' branch, forces a merge commit with --no-ff, and adds a custom message.