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?