top | item 45117882 (no title) seanssel | 5 months ago The IntelliJ 3-way mergetool/diff viewer is best in class. I haven't found anything else that touches it. discuss order hn newest koakuma-chan|5 months ago > I haven't found anything else that touches it.Have Claude Code resolve merge conflicts, problem solved. insane_dreamer|5 months ago One area I would not trust CC neurostimulant|5 months ago "vibe merging" conartist6|5 months ago Me either. I thought by now it would be standard UX everywhere, but that is very much not so. user432678|5 months ago Sublime Merge comes to mind, but I used it briefly before switching to JetBrains products. load replies (1)
koakuma-chan|5 months ago > I haven't found anything else that touches it.Have Claude Code resolve merge conflicts, problem solved. insane_dreamer|5 months ago One area I would not trust CC neurostimulant|5 months ago "vibe merging"
conartist6|5 months ago Me either. I thought by now it would be standard UX everywhere, but that is very much not so. user432678|5 months ago Sublime Merge comes to mind, but I used it briefly before switching to JetBrains products. load replies (1)
user432678|5 months ago Sublime Merge comes to mind, but I used it briefly before switching to JetBrains products. load replies (1)
koakuma-chan|5 months ago
Have Claude Code resolve merge conflicts, problem solved.
insane_dreamer|5 months ago
neurostimulant|5 months ago
conartist6|5 months ago
user432678|5 months ago