Vim is actually great for resolving merge conflicts, but I’ll grant it’s not for everyone. There are several different views available and dedicated navigation and resolution commands. For just viewing diffs, I use Delta for general purpose work but also reach for Difftastic to help understand big hairy diffs.

For all that, I’m not above using JetBrains Git UI for a quick commit and push if I’m already in the IDE anyway. Depends on where I am when I need to do the thing.