Game dev
Saved & recent

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
main 17 speed = 6 movement 17 speed = 8 resolved movement speed = 6 7 8 landing test passed two edits to line 17 chosen behavior verified
Both edits change the same speed setting. The resolver keeps 6, then checks that the 7.2-unit jump lands in the target interval from 7 to 8.

View in the full Game dev collection