Comment by onionisafruit

I’m happy with Jetbrains conflict resolution, but the I’ve never tried SmartGit for comparison.

It would take a lot for me to move because I already pay for Jetbrains IDE.