News for hackers. Stuff that matters.

A comment on Ask HN: What is your favorite tool to resolve Git merge conflicts?.

Re:Ask HN: What is your favorite tool to resolve Git merge c... by zachmjr on Wednesday July 12, 2023 @09:48AM (#36694466)
I use IntelliJ for that: https://www.jetbrains.com/help/idea/resolve-conflicts.html
[ Parent | on HN ]

There are no comments on this comment yet.