Why merging combines work in Git - Quick Recap

Recall & Review

beginner

What does merging do in Git?

Merging in Git combines changes from different branches into one, bringing together work done separately.

beginner

Why is merging important when multiple people work on the same project?

Merging helps combine everyone's changes so the project stays up to date and no work is lost.

intermediate

What happens if two branches change the same part of a file during a merge?

Git will show a conflict that needs to be fixed manually before finishing the merge.

intermediate

How does Git know what changes to combine during a merge?

Git compares the common starting point of branches and applies the changes made on each branch.

intermediate

What is a fast-forward merge?

A fast-forward merge happens when the branch being merged is ahead and can be added without creating a new merge commit.

What does Git merging do?

A Reverts all changes

B Deletes branches permanently

C Creates a new repository

D Combines changes from different branches

Merging combines changes from different branches into one.

What must you do if Git finds conflicting changes during a merge?

A Manually fix the conflicts

B Delete the repository

C Ignore the conflicts

D Restart the computer

Conflicts must be fixed manually before completing the merge.

When does a fast-forward merge happen?

A When branches are deleted

B When branches have conflicts

C When the branch is ahead and no new merge commit is needed

D When the repository is cloned

Fast-forward merge happens if the branch can be added directly without a merge commit.

Why is merging useful in teamwork?

A It creates new branches automatically

B It combines everyone's work into one place

C It deletes old files

D It stops others from working

Merging helps combine work from different people so the project stays updated.

What does Git compare to merge changes?

A The common starting point of branches

B The size of files

C The number of commits

D The date of last commit

Git uses the common ancestor to understand what changes to combine.

Explain in your own words why merging is like combining pieces of a puzzle.

Think about how separate puzzle pieces come together to form a full picture.

Describe what happens when two people change the same file and then try to merge their work.

Imagine two friends writing different endings to the same story.

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