# Conflict resolution

say it: **“KON-flikt rez-uh-LOO-shun”** **/ˈkɑnflɪkt ˌrɛzəˈluʃən/**

The chosen final content that replaces competing changes in a merge or rebase conflict.

## What is **Conflict resolution**?

**Conflict resolution** — The chosen final content that replaces competing changes in a merge or rebase conflict.

Level: Apprentice · [More Git terms at this level](https://www.ask-codey.com/glossary?category=git&level=2)

Updated: November 17, 2026

## In other subjects

- [Conflict Resolution in NoSQL](https://www.ask-codey.com/glossary/conflict-resolution-nosql)

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