Comment by superdaniel

For merges and other finicky git actions I’ve been increasingly turning to Atom instead of the commandline. I like how it auto-formats my commit messages to line wrap and how it makes highlighting merge conflicts easy.

For everything else these days I use VSCode.