rerere has worked pretty well for me when handling conflicts and it’s built into git.

I’ve worked with hundreds of engineers in a single codebase. Never had any issues like you’re describing.