[recursive]

I'm confused. Isn't the JetBrains IDE a gui? How can it be the best you've ever seen and impossible to sanely do merges?

FWIW, I've only ever done git merges in a gui, and never had any difficulty with it.

[gknoy]

He might mean that he uses Jetbrains' IDEs with git for nearly everything, but feels that using it to merge things is madness.

It seems strange, but I really like having a console-based workflow with my VCS. I can leverage grep, shell aliases, and so on to customize my interface a fair deal, and the forced interaction helps keep me mindful of what I am doing.

[tootie]

Typo. I meant it's impossible to do without a GUI