Conflict marker

say it: “KON-flikt MAR-ker” /ˈkɑnflɪkt ˈmɑrkər/

Text Git places in a conflicted file to show the competing versions that must be resolved.

What is Conflict marker?

Conflict marker — Text Git places in a conflicted file to show the competing versions that must be resolved.

Level: Apprentice · More Git terms at this level

Updated