Git · Junior · Question 22 of 75

What do the markers <<<<<<<, ======= and >>>>>>> in a file mean?

Explanation

Edit the file to the desired result, remove the markers, git add it and continue the merge (git commit or git merge --continue).

Further reading

Problem with a question

Git · Junior · question 22

Test yourself

Take the Git · Junior quiz: questions and options are shuffled, and you get a review of your mistakes at the end.

Take this quiz