Hacker News new | ask | show | jobs
by zachmjr 1069 days ago
I use IntelliJ for that: https://www.jetbrains.com/help/idea/resolve-conflicts.html