Git · Branches and integration

Merge conflict markers

Conflicts mark your side, the incoming side and the common base. Edit the file, remove markers, then stage it.

Syntax

<<<<<<< HEAD

Example

# inside the conflicted file
<<<<<<< HEAD
const timeout = 3000;
=======
const timeout = 5000;
>>>>>>> feature/auth

Reference pages are the quick answer. The course explains the why, shows the full example and ends with a challenge.