if JetBrains people are reading this, I love your products, but waaaay more code navigation and pane splitting/management features need to have keyboard shortcuts.
VS Code gets this very right. It's generally not as powerful or friendly as JetBrains products, but the far superior keyboard navigation experience gets me to attempt to switch once a month or so.
Not a JetBrains employee, but which features are you specifically looking for? I've never found a single option in the IDE that's available through a menu that cannot be assigned a shortcut.
You can use only the merge functionality - it can be launched from git (via mergetool).
I tried to convert from VS Code to PyCharm a while back - I didn't (too familiar with VSC), but I stuck with the merge view for some time - it's absolutely amazing!
I think its a step down from Beyond Compare, I've set that up as the diff tool in Intellij before, I might have to do that again in my current environment.
VS Code gets this very right. It's generally not as powerful or friendly as JetBrains products, but the far superior keyboard navigation experience gets me to attempt to switch once a month or so.