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.

Practice

1. What does the git merge command do in Git?

easy

A. It combines changes from one branch into the current branch.

B. It deletes a branch permanently.

C. It creates a new branch from the current branch.

D. It shows the commit history of the current branch.

Solution

1. Step 1: Understand the purpose of git merge

   The git merge command is used to combine changes from one branch into another branch.

2. Step 2: Identify the correct description

   Among the options, only It combines changes from one branch into the current branch. correctly describes merging changes into the current branch.

3. Final Answer:

   It combines changes from one branch into the current branch. -> Option A

4. Quick Check:

   git merge = combine branches [OK]

Hint: Merge means combine changes into current branch [OK]

Common Mistakes:

• Confusing merge with branch deletion
• Thinking merge creates a new branch
• Mixing merge with viewing history

2. Which of the following is the correct syntax to merge branch feature into the current branch?

easy

A. git merge --create feature

B. git merge -b feature

C. git merge feature

D. git merge --delete feature

Solution

1. Step 1: Recall the basic merge syntax

   The correct syntax to merge a branch is git merge branch_name.

2. Step 2: Match the syntax with options

   git merge feature matches the correct syntax. Options B, C, and D use invalid flags or commands.

3. Final Answer:

   git merge feature -> Option C

4. Quick Check:

   git merge + branch name = correct syntax [OK]

Hint: Use 'git merge branch_name' to merge branches [OK]

Common Mistakes:

• Adding incorrect flags like -b or --create
• Confusing merge with branch creation or deletion
• Using merge without specifying branch name

3. Given the following commands run in order:

git checkout main
git merge feature

What happens if the feature branch has commits not in main?

medium

A. The main branch is reset to feature branch state.

B. The feature branch is deleted automatically.

C. Git throws an error and stops the merge.

D. The commits from feature are added to main.

Solution

1. Step 1: Understand merge behavior with new commits

   When merging a branch with new commits, Git combines those commits into the current branch.

2. Step 2: Analyze the options

   The commits from feature are added to main correctly describes this behavior. Options B, C, and D describe incorrect or unrelated behaviors.

3. Final Answer:

   The commits from feature are added to main. -> Option D

4. Quick Check:

   Merge adds commits [OK]

Hint: Merge adds commits, does not delete branches [OK]

Common Mistakes:

• Thinking merge deletes branches
• Expecting merge to reset branches
• Assuming merge always fails with new commits

4. You run git merge feature but Git reports a conflict. What should you do next?

medium

A. Restart Git to clear the conflict.

B. Manually resolve the conflicts in files, then run git add and git commit.

C. Run git merge --force to ignore conflicts.

D. Delete the feature branch and try merging again.

Solution

1. Step 1: Understand merge conflicts

   When Git reports conflicts, it means changes clash and need manual fixing.

2. Step 2: Resolve conflicts properly

   You must edit conflicted files to fix issues, then stage and commit the changes to complete the merge.

3. Final Answer:

   Manually resolve the conflicts in files, then run git add and git commit. -> Option B

4. Quick Check:

   Fix conflicts manually, then add and commit [OK]

Hint: Fix conflicts manually, then add and commit [OK]

Common Mistakes:

• Trying to force merge ignoring conflicts
• Deleting branches to fix conflicts
• Restarting Git expecting conflicts to clear

5. You want to merge branch feature into main but keep main's changes in case of conflict (favor main). Which command helps achieve this?

hard

A. git merge -X ours feature

B. git merge --no-ff feature

C. git merge -s recursive feature

D. git merge --abort feature

Solution

1. Step 1: Understand merge strategies

   The -X ours option tells Git to favor the current branch's changes during conflicts.

2. Step 2: Match the option to the goal

   git merge -X ours feature uses -X ours to keep main's changes if conflicts occur. Other options do not achieve this.

3. Final Answer:

   git merge -X ours feature -> Option A

4. Quick Check:

   Use -X ours to favor current branch on conflicts [OK]

Hint: Use 'git merge -X ours' to keep current branch changes [OK]

Common Mistakes:

• Confusing -X ours with --no-ff
• Using --abort to fix conflicts
• Not specifying strategy option