Merge conflict
Related terms: merge, conflict markers, resolution, branch
A situation where version control cannot safely combine changes automatically. Two branches might edit the same lines differently, or one might delete a file the other changed.
Inspect both intentions, choose or combine the result, then check it in the game. Removing conflict markers is only the text-editing step. Binary assets may need manual rework or choosing one version; asset locking can reduce that kind of overlap.
- Further reading
- Git: git-merge Documentation