3 ms·

I can second this—the JetBrains merge conflicts ui is the best I’ve ever seen. For some reason there are a lot of subpar uis though. E.g. not showing three ver

• ninetyninenine 2y ago
  I've seen another gui waaay back before git was popular. Perforce actually handled merge conflicts with a GUI just as good. I think it's still just as good, though almost no one uses it.
  • oniony 2y ago
    I still use it. Even have it set up with Jujutsu. Only complaint is that you have to explicitly exit the app after each use. It's still free, too.
    • ninetyninenine 2y ago
      It works with git??? I had no idea. I highly recommend anyone reading this to try out P4merge as the merge conflict resolver for git. It might be the better alternative to jetbrains as jetbrains usually involves buying into using the entire editor.
      • oniony 2y ago
        Yup, you can get it from https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge https://www.perforce.com/products/helix-core-apps/merge-diff.... I actually use Difftastic on the command-line for diffs and spit out to P4Merge for merges. Here's my Jujutsu config: [ui] diff.tool = ["difft", "--color=always", "--display=side-by-side-show-both", "$left", "$right"] merge-editor = ["/Applications/p4merge.app/Contents/MacOS/p4merge", "-nl", "Theirs", "-nb", "Base", "-nr", "Mine", "$base", "$left", "$right", "$output" ]
        • WolfeReader 2y ago
          I started using this today, and it's pretty amazing. Thank you!
  • chrisweekly 2y ago
    I know many people who like p4merge and have used it as their mergetool in git