There is no shame in using the tools you like best, whether they be GUI or CLI. I use the command line for everything but resolving merge conflicts. I really l

There is no shame in using the tools you like best, whether they be GUI or CLI. I use the command line for everything but resolving merge conflicts. I really like the JetBrains UX for resolving them!