Comment by jghn
1 day ago
I do almost everything git manually at the CLI. But the Jetbrains IDEs have a fantastic GUI git merge tool, and I also like the local git diff UI. Add in integrated blame mode, ability to pull up version-diff files, and that sort of thing.
It's not part of my daily driver toolbox, but they do get used a lot by me.
You made me realize that I actually do use it, since I often look at git blame and the past changes.
And I like the (recent?) update in which the changes from current commit (not only stage) are coloured.
Exactly. There's a lot of little niceties buried in the integration across the board. I'm convinced that many VSCode supporters have never used a true IDE because whenever I complain about VSCode's shortcomings I'm met with "why would you want that?". Sure, but this git example is a great one because for most of it I *don't* want it, but there's a lot of related bits that I *do* want.
I'm a bit mixed, as I really appreciate the balance that VS Code has brought to the table and even with that feel there's sometimes too much in the base install. JetBrains is definitely better than VS proper in a lot of ways though. I still have nightmares of using VS for web projects, it's not nearly as bad today but I still completely avoid it.
Merge is about the only time I look for gui experience with git. I'm by no means an expert at git.
It's the only git operation I do with a gui. But as I said elsewhere, there are a lot of little integrations I do make use of. For instance I find it helpful to have git blame up on the side when editing a file.
I almost always operate in my own feature branch, squashing and then rebasing along the way... sometimes I'll just keep amending my feature commit as I work. I find it just saves me a lot of pain along the way.