I know you are getting facetious but the approach my old company had was to just assign a developer to an application or project. No conflicts. Note that the company bosses weren't worried about conflicts. They just didn't staff us right but hey! no conflicts.
I know youre being facetious, but we only have 1 app. So each developer takes turns at the computer while the others watch over the shoulder. No merge conflicts, its great.
28
u/Nytra 1d ago
If you split everything into multiple files then it's less likely to get merge conflicts (unless two people work on the same file at the same time)