I use IntelliJ for that: https://www.jetbrains.com/help/idea/resolve-conflicts.html