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

> I haven't found anything else that touches it.

Have Claude Code resolve merge conflicts, problem solved.

	▲	insane_dreamer 6 days ago \| parent \| next [-]
		One area I would not trust CC
	▲	neurostimulant 6 days ago \| parent \| prev [-]
		"vibe merging"

conartist6 6 days ago | parent | prev [-]

Me either. I thought by now it would be standard UX everywhere, but that is very much not so.

Sublime Merge comes to mind, but I used it briefly before switching to JetBrains products.

	▲	conartist6 6 days ago \| parent [-]
		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?