Esc
↑↓ navigate   Enter open   Esc close

Git & Version Control

Merge Conflict

/mɜːdʒ ˈkɒnflɪkt/

Definition

A situation where two branches changed the same part of the same file, requiring manual resolution before merging.

Example in context

"Both my branch and main changed the same database URL in config — classic merge conflict."

Related terms

  • Rebase — A Git operation that reapplies a series of commits onto a different base commit, resulting in a clean, linear history.

Practice this term

Master Merge Conflict in context by working through exercises in the Git & Version Control module. You'll see the term used in real engineering scenarios with multiple-choice, fill-in-the-blank, and matching drills.

Practice in exercises → Browse all words