Merge conflict
say it: “MURJ KON-flikt” /mɝːdʒ ˈkɑnflɪkt/
A situation in which Git cannot safely combine competing changes without a person's decision.
What is Merge conflict?
Merge conflict — A situation in which Git cannot safely combine competing changes without a person's decision.
Level: Apprentice · More Git terms at this level
Updated