git merge command - Commands & Configuration

Introduction

When you work on different features or fixes in separate branches, you need a way to combine those changes into one place. The git merge command helps you bring changes from one branch into another, making your project up to date with all work done.

When you finish a feature on a separate branch and want to add it to the main branch.

When you want to combine bug fixes from a hotfix branch back into the development branch.

When you want to update your current branch with the latest changes from another branch.

When you want to keep your branches synchronized after working separately.

When you want to prepare your code for release by merging all completed work.

Commands

Switch to the main branch where you want to merge changes.

Terminal

git checkout main

Expected Output

Switched to branch 'main'

Merge the changes from 'feature-branch' into the current branch (main). This combines the work done on the feature branch into main.

Terminal

git merge feature-branch

Expected Output

Updating 1a2b3c4..5d6e7f8

Fast-forward

 file.txt | 2 ++

 1 file changed, 2 insertions(+)

Check the status to confirm the merge was successful and there are no conflicts or uncommitted changes.

Terminal

git status

Expected Output

On branch main

Your branch is up to date with 'origin/main'.

nothing to commit, working tree clean

Key Concept

If you remember nothing else from this pattern, remember: git merge combines changes from one branch into another to keep your project up to date.

Common Mistakes

Trying to merge without switching to the target branch first.

Git merges changes into the current branch, so merging on the wrong branch will combine changes where you don't want them.

Always use 'git checkout' to switch to the branch you want to merge into before running 'git merge'.

Ignoring merge conflicts and not resolving them.

Merge conflicts stop the merge process and leave your project in an incomplete state until fixed.

When conflicts appear, open the conflicting files, fix the issues, then use 'git add' and 'git commit' to complete the merge.

Summary

Use 'git checkout' to switch to the branch where you want to add changes.

Run 'git merge branch-name' to combine changes from another branch.

Check 'git status' to confirm the merge succeeded and no conflicts remain.

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