I use Jetbrains IDEs and most of my life has been IDE based git interaction. And I honestly love it, easy access to see my diffs, the most common commit, push and stage(or shelve as Jetbrains does it, which is better than visual studio). Hassle free and available beats writing anything to me.

[–] AusatKeyboardPremi@lemmy.world 13 points 1 day ago

How do you view diffs and merges when you say you don't use git GUIs? External tool or terminal/command line?

Terminal.

I use Jetbrains IDEs and most of my life has been IDE based git interaction. And I honestly love it, easy access to see my diffs, the most common commit, push and stage(or shelve as Jetbrains does it, which is better than visual studio). Hassle free and available beats writing anything to me.

Perhaps, it is a mix of learned behaviour and cognitive fixation, as I started out my development journey predominantly using a terminal, that I cannot fathom Git GUI being hassle free.

Nice to read a different perspective on such a fundamental thing that I take for granted while working. Thank you for sharing it.

[–] AdamBomb@lemmy.sdf.org 1 points 1 day ago

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.