Hacker News new | ask | show | jobs
by seanssel 286 days ago
The IntelliJ 3-way mergetool/diff viewer is best in class. I haven't found anything else that touches it.
2 comments
koakuma-chan 286 days ago
> I haven't found anything else that touches it.

Have Claude Code resolve merge conflicts, problem solved.

link
insane_dreamer 286 days ago
One area I would not trust CC
link
neurostimulant 286 days ago
"vibe merging"
link
conartist6 286 days ago
Me either. I thought by now it would be standard UX everywhere, but that is very much not so.
link
user432678 286 days ago
Sublime Merge comes to mind, but I used it briefly before switching to JetBrains products.
link
conartist6 286 days ago
Yeah, no, I tried that thinking it was going to be the JetBrains merge as a standalone product and it simply does not have the three-way sauce. Sublime doesn't even offer any way I can view a live base->left or base->right view as I do the merge does it?
link