With our toolset and using VSCode we get the option of displaying conflicting code blocks next to one another and clicking to choose which version to go with. We're quite a small team (of eight) so this isn't usually too much of a problem.
Comment by No One on "What is the best approach to resolving merge conflicts?" | Hashnode