I haven't used Magit or GitUp, but I really appreciate JetBrains IDE automatic conflict resolver.