Merge conflicts why they happen in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is a merge conflict in Git?

A merge conflict happens when Git cannot automatically combine changes from two branches because the same part of a file was changed differently in each branch.

beginner

Why do merge conflicts happen?

They happen because two or more people changed the same lines in a file or when changes overlap and Git can't decide which change to keep.

intermediate

How can you reduce the chance of merge conflicts?

By communicating with your team, pulling changes often, and working on different parts of the code to avoid editing the same lines at the same time.

beginner

What does Git show when a merge conflict occurs?

Git marks the conflicting parts in the file with special symbols like <<<<<<<, =======, and >>>>>>> so you can see both versions and decide how to fix it.

intermediate

Can merge conflicts happen with binary files?

Yes, but Git cannot show differences for binary files, so conflicts must be resolved by choosing one version or using special tools.

What causes a merge conflict in Git?

A Files are deleted in one branch only

B Branches have different names

C Branches are merged in the same order

D Two branches change the same lines differently

Merge conflicts happen when the same lines in a file are changed differently in two branches.

Which symbol does Git use to mark conflicts in files?

A #####, $$$$$$, @@@@@@

B <<<<<<<, =======, >>>>>>>

C *****, ++++++, -----

D %%%%%%, &&&&&&, !!!!!

Git uses <<<<<<<, =======, and >>>>>>> to show conflicting sections in files.

How can you avoid merge conflicts?

A Work on different parts of the code and pull changes often

B Never update your branch

C Delete files before merging

D Merge without checking changes

Working on different code parts and frequently updating your branch reduces conflicts.

What should you do when a merge conflict occurs?

A Manually edit the file to fix conflicts

B Delete the file

C Ignore the conflict and commit

D Restart Git

You must manually resolve conflicts by editing the file and choosing which changes to keep.

Can Git automatically resolve all merge conflicts?

A Only for binary files

B Yes, always

C No, some conflicts need manual fixing

D Only if branches are identical

Git can auto-merge many changes but some conflicts require manual resolution.

Explain why merge conflicts happen in Git and how you can recognize them.

Think about what happens when two people edit the same sentence differently.

Describe strategies to reduce merge conflicts when working in a team.

How can you avoid stepping on each other's toes in coding?

Practice

1. Why do merge conflicts happen in Git?

easy

A. Because Git lost the commit history

B. Because the same part of a file was changed differently in two branches

C. Because the repository is too large

D. Because the branch names are the same

Solution

1. Step 1: Understand what causes merge conflicts

   Merge conflicts happen when Git tries to combine changes but finds different edits in the same part of a file from two branches.

2. Step 2: Identify the correct cause

   Only when the same lines are changed differently does Git stop and ask for help, causing a conflict.

3. Final Answer:

   Because the same part of a file was changed differently in two branches -> Option B

4. Quick Check:

   Same file part changed differently = merge conflict [OK]

Hint: Conflicts happen when edits overlap in the same file area [OK]

Common Mistakes:

• Thinking conflicts happen due to repo size
• Believing branch names cause conflicts
• Assuming commit history loss causes conflicts

2. Which Git command is used to start a merge that might cause conflicts?

easy

A. git push

B. git branch

C. git clone

D. git merge

Solution

1. Step 1: Identify the command that combines branches

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

2. Step 2: Understand when conflicts occur

   Conflicts can happen during this merge if changes overlap, so git merge is the command that triggers this process.

3. Final Answer:

   git merge -> Option D

4. Quick Check:

   git merge starts merges that may conflict [OK]

Hint: Use git merge to combine branches and check for conflicts [OK]

Common Mistakes:

• Confusing git branch with git merge
• Using git clone to merge
• Thinking git push merges branches

3. Given two branches, master and feature, both changed the same line in app.txt. What will happen when you run git merge feature on master?

medium

A. Git will automatically merge without any issues

B. Git will delete app.txt

C. Git will create a merge conflict in app.txt

D. Git will ignore changes from feature branch

Solution

1. Step 1: Analyze the changes in both branches

   Both branches changed the same line in app.txt, so Git cannot decide which change to keep automatically.

2. Step 2: Understand Git's behavior on conflicting changes

   Git will stop the merge and mark app.txt as conflicted, requiring manual resolution.

3. Final Answer:

   Git will create a merge conflict in app.txt -> Option C

4. Quick Check:

   Same line changed differently = conflict created [OK]

Hint: Same line changed in both branches causes conflict [OK]

Common Mistakes:

• Assuming Git merges automatically always
• Thinking Git deletes files on conflict
• Believing Git ignores conflicting changes

4. You ran git merge feature and got a conflict. Which step should you take to fix it?

medium

A. Edit the file to choose which changes to keep, then commit

B. Rename the branch and try merging again

C. Run git push immediately

D. Delete the conflicting file and commit

Solution

1. Step 1: Understand how to resolve merge conflicts

   When a conflict occurs, you must open the conflicting file and decide which changes to keep or combine.

2. Step 2: Complete the merge after resolving conflicts

   After editing and saving the file, you add it and commit to finish the merge process.

3. Final Answer:

   Edit the file to choose which changes to keep, then commit -> Option A

4. Quick Check:

   Resolve conflicts by editing files, then commit [OK]

Hint: Fix conflicts by editing files before committing [OK]

Common Mistakes:

• Deleting files instead of resolving conflicts
• Pushing before resolving conflicts
• Renaming branches to fix conflicts

5. Two developers edited different parts of the same file in separate branches. When merging, why might Git NOT report a conflict?

hard

A. Because changes are in different lines and Git can merge automatically

B. Because Git ignores changes in one branch

C. Because the file was deleted in one branch

D. Because the branches have the same name

Solution

1. Step 1: Understand Git's merge behavior with non-overlapping changes

   If changes are made in different parts of a file, Git can combine them automatically without conflicts.

2. Step 2: Recognize why no conflict occurs

   Since the edits do not overlap, Git merges both changes smoothly.

3. Final Answer:

   Because changes are in different lines and Git can merge automatically -> Option A

4. Quick Check:

   Non-overlapping changes merge without conflict [OK]

Hint: Different lines changed merge automatically [OK]

Common Mistakes:

• Thinking Git ignores one branch's changes
• Assuming file deletion causes no conflict
• Believing branch names affect conflicts