it's fine for simple merge conflicts but it quickly gets messy when the two branches are trying to do opposite things to the same code

it's maybe more annoying in gamedev. textures, models are binary files that can't be changed line-by-line.