AI engineering glossary · Command line Git
What is merge conflict?
Merge conflict (also called Conflict): A situation where two branches changed the same part of a file in different ways, so Git cannot decide which to keep. It marks the file with conflict markers and waits for you to edit, stage and finish the merge.
Merge conflict: an example
Two people change the learning rate on the same line; Git inserts <<<<<<<, ======= and >>>>>>> markers until one value is chosen.
Related terms
More Command line Git terms
Where you learn it
Merge conflict is part of the AI Engineering Program, which teaches it with notes, a hands-on lab and an exam. The first lesson is free.