Glossary: Git Beyond the Basics

conflict markers

Also written: <<<<<<<, =======, >>>>>>>

Lines Git writes into a file to show where two sides' changes clash. They must be edited out before committing.