Reading conflict markers in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What are conflict markers in Git?

Conflict markers are special lines Git adds to files when it can't automatically merge changes. They show where the conflicts are so you can fix them.

beginner

Identify the three parts of a Git conflict marker.

The three parts are: <<<<<<< HEAD (your changes), ======= (separator), and >>>>>>> branch-name (incoming changes).

beginner

What does the line starting with <<<<<<< mean in a conflicted file?

It marks the start of your current branch's version of the conflicting code.

beginner

What should you do after seeing conflict markers in your file?

You should read the conflicting sections, decide which code to keep or combine, remove the conflict markers, and then save the file.

beginner

Why does Git add conflict markers instead of merging automatically?

Git adds conflict markers when it can't decide which changes to keep because both branches changed the same part of the file differently.

What does the ======= line in a Git conflict marker separate?

A Two unrelated files

B The start and end of the file

C The commit message and the code

D Your changes and the incoming changes

The ======= line separates your current branch's changes from the incoming branch's changes.

Which marker shows the incoming branch's changes in a conflict?

A <<<<<<< HEAD

B >>>>>>> branch-name

C =======

D # Conflict start

The >>>>>>> branch-name marker shows the incoming branch's conflicting changes.

What is the first step to resolve a Git conflict after seeing conflict markers?

A Read and understand the conflicting sections

B Delete the file

C Commit the file immediately

D Run git push

You must first read and understand the conflicting sections before deciding how to fix them.

If you want to keep only your changes in a conflict, what should you do?

A Keep all code including markers

B Keep the code after =======

C Keep the code between <<<<<<< HEAD and =======, remove the rest

D Delete the entire file

To keep your changes, keep the code between <<<<<<< HEAD and ======= and remove the rest including markers.

Why might Git not be able to merge automatically?

A Because both branches changed the same lines differently

B Because the commit messages are missing

C Because the internet is slow

D Because the files are too large

Git cannot merge automatically when both branches changed the same lines in different ways.

Explain what conflict markers look like in a Git file and what each part means.

Think about how Git shows your version and the other branch's version.

Describe the steps you take to resolve a file with Git conflict markers.

Focus on understanding, editing, and finalizing the file.