Why merging combines work in Git - The Real Reasons

The Big Idea

What if you could combine your work with others instantly without losing anything?

The Scenario

Imagine you and your friend are writing a story together, but you each write different chapters on separate papers. Now, you need to put all chapters into one book by hand.

The Problem

Manually copying and pasting chapters is slow and confusing. You might miss pages, overwrite parts, or create a messy story that doesn't flow well.

The Solution

Merging in Git automatically combines your work and your friend's work into one complete story. It carefully checks for overlaps and helps fix conflicts, making teamwork smooth and fast.

Before vs After

✗ Before

Copy chapter from friend's paper
Paste into your story
Fix overlaps by hand

✓ After

git merge friend-branch
Resolve conflicts if any
Story combined automatically

What It Enables

Merging lets multiple people work on the same project at the same time without losing or breaking each other's work.

Real Life Example

Developers working on different features merge their changes so the final app includes all new improvements without errors.

Key Takeaways

Manual combining is slow and error-prone.

Merging automates combining work safely.

It enables smooth teamwork on shared projects.

Practice

1. What does the git merge command do in a project?

easy

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

B. It deletes a branch permanently.

C. It combines changes from one branch into another branch.

D. It shows the history of commits in 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: Compare with other git commands

   Deleting branches is done with git branch -d, creating branches with git branch, and viewing history with git log. None of these combine work like merge.

3. Final Answer:

   It combines changes from one branch into another branch. -> Option C

4. Quick Check:

   Merge = combine changes [OK]

Hint: Merge means combining work from branches [OK]

Common Mistakes:

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

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

easy

A. git merge feature

B. git merge -b feature

C. git merge --create feature

D. git merge -d feature

Solution

1. Step 1: Recall the git merge syntax

   The correct syntax to merge a branch is git merge <branch-name>. So for branch 'feature', it is git merge feature.

2. Step 2: Identify incorrect options

   Options with flags like -b, --create, or -d are not valid for merging branches.

3. Final Answer:

   git merge feature -> Option A

4. Quick Check:

   Merge syntax = git merge branch-name [OK]

Hint: Use 'git merge branch-name' to combine branches [OK]

Common Mistakes:

• Adding wrong flags like -b or -d
• Confusing merge with branch creation
• Using incorrect command order

3. Given the following commands run in order:

git checkout main
git merge feature

What happens after these commands?

medium

A. The 'feature' branch is deleted.

B. The 'main' branch is reset to the state of 'feature'.

C. A new branch named 'feature' is created.

D. The changes from the 'feature' branch are combined into 'main'.

Solution

1. Step 1: Analyze the commands

   First, git checkout main switches to the 'main' branch. Then, git merge feature merges changes from 'feature' into 'main'.

2. Step 2: Understand the effect of merge

   The merge combines the work from 'feature' into 'main' without deleting or resetting branches.

3. Final Answer:

   The changes from the 'feature' branch are combined into 'main'. -> Option D

4. Quick Check:

   Checkout + merge = combine changes [OK]

Hint: Checkout target branch, then merge source branch [OK]

Common Mistakes:

• Thinking merge deletes branches
• Confusing merge with reset
• Assuming merge creates new branches

4. You ran git merge feature but got a conflict error. What should you do next?

medium

A. Delete the 'feature' branch to fix the conflict.

B. Manually resolve conflicts in files, then commit the merge.

C. Run git merge --abort and ignore the changes.

D. Run git reset --hard to force merge.

Solution

1. Step 1: Understand merge conflicts

   When a conflict occurs, Git stops the merge and asks you to fix conflicting files manually.

2. Step 2: Resolve conflicts and complete merge

   You must open the conflicting files, fix the differences, then commit the merge to finish combining work.

3. Final Answer:

   Manually resolve conflicts in files, then commit the merge. -> Option B

4. Quick Check:

   Conflicts require manual fix + commit [OK]

Hint: Fix conflicts manually, then commit merge [OK]

Common Mistakes:

• Deleting branches to fix conflicts
• Aborting merge without resolving
• Using reset to force merge ignoring conflicts

5. You have two branches: main and feature. Both have new commits. You want to combine them so main has all changes, but keep the history clear. Which sequence is best?

hard

A. Checkout main, run git merge feature, then push main.

B. Checkout feature, run git merge main, then delete main.

C. Delete feature, then copy files manually to main.

D. Checkout main, run git rebase feature, then push main.

Solution

1. Step 1: Identify the goal

   You want main to have all changes from both branches and keep history clear.

2. Step 2: Choose the correct merge approach

   Checking out main and merging feature combines work properly and keeps history intact. Rebasing rewrites history and is more complex.

3. Final Answer:

   Checkout main, run git merge feature, then push main. -> Option A

4. Quick Check:

   Merge feature into main to combine work [OK]

Hint: Merge feature into main branch to combine work safely [OK]

Common Mistakes:

• Merging main into feature instead of the reverse
• Deleting branches before merging
• Using rebase without understanding history rewrite