Mainframe Path Start learning free
Modern

Conflict markers

The <<<<<<<, ======= and >>>>>>> lines Git writes into a file when a merge cannot combine two changes to the same lines. Your side comes before =======, the merged-in side after it.

See it in context
Git and GitHub for mainframe developers: Branches, pull requests, reviews and conflicts

Read the lesson

Related Modern terms