# 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](https://www.ask-codey.com/glossary?category=git&level=2)

Updated: November 17, 2026

Source: https://www.ask-codey.com/glossary/conflict-marker
