Conflict markers

Learn the conflict markers and their structure.

What Are Conflict Markers?

When two branches make different changes to the same section of a file, Git may create a merge conflict. Instead of choosing which content to keep, Git marks the conflicting section with special markers.

<<<<<<< HEAD
console.log("Merhaba");
=======
console.log("Hello");
>>>>>>> feature

The contents of the current branch and the branch being merged appear between these markers.

Ours and Theirs Sections

In a conflict, ours refers to the current branch's content, while theirs refers to the content from the branch being merged. The HEAD marker identifies the current branch, and the branch name in the closing marker helps identify the other side.

<<<<<<< HEAD
Ours content
=======
Theirs content
>>>>>>> feature

You can choose either section or combine both to create new content.

Exercise Build a Conflict Structure

Create a conflict text in JavaScript. Assign a string containing <<<<<<< HEAD for the current branch, ======= as the separator, and >>>>>>> feature as the closing marker to the conflict variable. Print the text.

Show example solution

const conflict = "<<<<<<< HEAD\nOurs\n=======\nTheirs\n>>>>>>> feature";

console.log(conflict);

Test yourself

Which section between conflict markers represents the current branch's content?
- The section after the >>>>>>> marker
- The section at the end of the file
- The section after the ======= marker
- The section after the <<<<<<< HEAD marker
Show answer

The section after the <<<<<<< HEAD marker — The current branch's content appears after <<<<<<< HEAD. The ======= marker separates the two sides.

Complete the Conflict Separator

<<<<<<< HEAD
console.log("A");
____
console.log("B");
>>>>>>> feature

Show answer

<<<<<<< HEAD
console.log("A");
=======
console.log("B");
>>>>>>> feature

Recognize Conflict Markers

<<<<<<< HEAD

Start of the current branch section
=======

Separates the two sides
>>>>>>> feature

End of the incoming branch section
ours

Current branch content

Next lesson: Resolving a conflict

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies