Reading conflict markers in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

Identify the conflict content from Git conflict markers

Given the following conflict markers in a file after a merge conflict, what is the content from the current branch (HEAD)?

<<<<<<< HEAD
Line A
=======
Line B
>>>>>>> feature-branch

Git

<<<<<<< HEAD
Line A
=======
Line B
>>>>>>> feature-branch

A No content, conflict markers only

B Line A

C Line A and Line B combined

D Line B

💡 Hint

The content between <<<<<<< HEAD and ======= is from the current branch.

In Git conflict markers, the section between <<<<<<< HEAD and ======= shows the current branch's content. The section after ======= until >>>>>>> shows the incoming branch's content.

💻 Command Output

intermediate

What does Git show after a merge conflict?

After running git merge feature, you see conflict markers in a file:

<<<<<<< HEAD
int x = 5;
=======
int x = 10;
>>>>>>> feature

What does this indicate?

Git

git merge feature

A The feature branch was deleted

B The merge was successful with no conflicts

C The file has conflicting changes between current branch and feature branch

D The file was unchanged

💡 Hint

Conflict markers appear only when Git cannot automatically merge changes.

Git shows conflict markers when it cannot merge changes automatically. The markers highlight the conflicting sections from each branch.

❓ Troubleshoot

advanced

Resolving conflicts with multiple conflict markers

You see this in a file after a merge:

<<<<<<< HEAD
Line 1
=======
Line 1 modified
>>>>>>> feature

Some other text

<<<<<<< HEAD
Line 2
=======
Line 2 modified
>>>>>>> feature

What is the correct way to resolve these conflicts?

Git

<<<<<<< HEAD
Line 1
=======
Line 1 modified
>>>>>>> feature

Some other text

<<<<<<< HEAD
Line 2
=======
Line 2 modified
>>>>>>> feature

A Edit each conflict section to choose or combine changes, then remove all conflict markers

B Delete the entire file and recreate it

C Ignore the conflict markers and commit the file as is

D Run 'git reset --hard' to discard all changes

💡 Hint

You must manually fix each conflict section and remove markers before committing.

Each conflict section must be resolved by choosing or combining changes. After editing, all conflict markers must be removed to finalize the merge.

✅ Best Practice

advanced

Best practice to avoid long conflict markers in files

Which practice helps reduce the chance of large conflict markers appearing in files during merges?

A Always delete conflicting files and recreate them

B Avoid committing code for long periods

C Use only one branch for all development

D Commit small, frequent changes and pull updates often

💡 Hint

Frequent syncing helps keep branches aligned.

Small, frequent commits and regularly pulling changes reduce divergence, minimizing conflicts and large conflict markers.

🧠 Conceptual

expert

Understanding nested conflict markers in Git

Is it possible for Git to produce nested conflict markers (conflict markers inside conflict markers) in a file after a merge? Why or why not?

A Yes, but only if manual edits introduce nested markers

B Yes, Git can nest conflict markers if multiple merges overlap

C No, Git never nests conflict markers; each conflict is separate and flat

D No, Git removes all conflict markers automatically

💡 Hint

Think about how conflict markers are generated and edited.

Git itself does not produce nested conflict markers. Nested markers can appear only if a user manually edits a conflicted file and adds markers inside existing ones.