I feel your pain. I have to resort to the web for gitlab which is what we use for source control for really big conflicts. But as a team we try to get everyone

I feel your pain. I have to resort to the web for gitlab which is what we use for source control for really big conflicts. But as a team we try to get everyone to merge often and are very long lived branches as code smells. This keeps changes small and conflicts small.