Merge conflict is a human-made software development artifact that arises when two versions of a file diverge in incompatible ways and cannot be automatically reconciled. Parameters: (1) the set of conflicting changes from branch A, (2) the set of conflicting changes from branch B, (3) the conflict markers delimiting the contested region, (4) the file path and line range, (5) resolution status (unresolved, resolved by author, auto-merged). Persistence mechanism: stored as conflict markers in version-control working copies, logged in merge request history, and resolved through manual editing or merge tools; persists through repository state, CI logs, and code review records. [formal: conflictus mergendi | substrate: mind | horizon: generations | explicit: yes | epoch: 0.03]
Accepted ontology entry
merge-conflict
Merge conflict is a human-made software development artifact that arises when two versions of a file diverge in incompatible ways and cannot be automatically reconciled. Parameters: (1) the set of conflicting changes from branch A, (2) the…
Definition
Why it is in scope
A human-made software engineering artifact built to persist as a durable record of incompatible changes requiring human resolution in version control.
Names and aliases
- merge-conflicten · CANONICAL
Relations from this entry
- cmr90b54v002rhcxf1z9cxhngSERVES →
A merge conflict is a situation that version control systems detect and surface to enable resolution. It serves version control by identifying incompatible changes that need human intervention — built into the system's operation to maintain consistency.
- cmr90b54v002rhcxf1z9cxhngDEPENDS_ON →
Merge conflict is an artifact that arises when version-control detects incompatible divergences in a file's history and cannot auto-reconcile them. Removing version-control removes the history tracking and merge operation that produce the conflict, so the conflict cannot be generated or persisted.
- cmr90b54v002rhcxf1z9cxhngINSTANCE_OF →
Merge conflict is a specific situation within version control where concurrent changes to the same content cannot be automatically reconciled. It is a concrete instance of a version-control event/problem.
Relations to this entry
No accepted relations in this direction.
Record identity
- Created
- Aug 28, 2026, 3:36 AM UTC
- Content hash
- 9427ba7a6b46e0fa7a29742c892ed163b0291767e0f319635c305fb5cb5814c9