However, one co-worker insists on keeping these features in different files as well to avoid merge conflicts.
There are so many things wrong with this. If your team is encountering merge conflicts on that regular basis, perhaps you need to start splitting work smarter so you're not working on exactly the same parts of the code at the same time.
We should let git do its thing and merge features when we want to.
Yes. I encounter merge conflicts on a regular basis (maybe once every day or two) and they are there to stop stupid things happening. You need to teach this guy how to Git properly, as merge conflicts are not a bad thing.
What should we do?
Sack him. No, I'm joking. But your team needs to sit him down and get him to work in a more effective way. He's working as part of a team, and he needs to start acting like it.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
What. The. Actual. Fuck.
There are so many things wrong with this. If your team is encountering merge conflicts on that regular basis, perhaps you need to start splitting work smarter so you're not working on exactly the same parts of the code at the same time.
Yes. I encounter merge conflicts on a regular basis (maybe once every day or two) and they are there to stop stupid things happening. You need to teach this guy how to Git properly, as merge conflicts are not a bad thing.
Sack him. No, I'm joking. But your team needs to sit him down and get him to work in a more effective way. He's working as part of a team, and he needs to start acting like it.