6 ms·

The IntelliJ 3-way mergetool/diff viewer is best in class. I haven't found anything else that touches it.

• conartist6 1y ago
  Me either. I thought by now it would be standard UX everywhere, but that is very much not so.
  • user432678 1y ago
    Sublime Merge comes to mind, but I used it briefly before switching to JetBrains products.
    • conartist6 1y 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?
• koakuma-chan 1y ago
  > I haven't found anything else that touches it. Have Claude Code resolve merge conflicts, problem solved.
  • insane_dreamer 1y ago
    One area I would not trust CC
  • neurostimulant 1y ago
    "vibe merging"