Please enable JavaScript to use CodeHS

CodeHS Glossary


Conflict Markers General

The lines <<<<<<<, =======, and >>>>>>> that Git adds to a file to show the two conflicting versions. They must be deleted when the conflict is resolved.