Conflicts Glossary

Browse 3 conflicts terms defined in plain English, from the cultural dictionary of computing.

3 Conflicts Terms

Merge Hell: A painful state where branches have diverged so much that combining them creates a maze of conflicts, regressions, and uncertainty. It usually reflects large...
Name Collision: A conflict caused by two things sharing the same name in a scope where that creates ambiguity or breakage. In engineering slang, name collisions are one of...
Namespace Collision: A conflict that occurs when two things expected to have distinct names end up sharing the same identifier space and collide. It shows up in code symbols,...