4 ms·I haven't used Magit or GitUp, but I really appreciate JetBrains IDE automatic conflict resolver.by joshuanapoli 2y agoI haven't used Magit or GitUp, but I really appreciate JetBrains IDE automatic conflict resolver.