I miss FileMerge.app
Meld is like. *Okay*. Like it's okay. Barely. And I'm always a little afraid I'm going to Hold It Wrong and lose data. And I don't actually know how to wire it for use with git
My solution for years to every git problem was "I will become fantastically proficient with Mercurial, and when I need to do something weird I'll clone into Mercurial and do the work there". And then git-lfs happened and suddenly I was using a mix of Mercurial and git and my plan did not work anymore
I thought jj would swoop out of nowhere and solve my problems but then I just keep seeing posts from jj devs about "AI code assistants" and now I am increasingly convinced if I have problems I will have to solve them myself
I don't believe I've lost data with Meld, but I have seen it 💩 the bed if the files are binary or a bit too large…
@argv_minus_one I miss Kaleidoscope. I miss a lot of Cocoa programs.
@mcc a couple times, when shit got complex enough that i actually needed a 3-way merge view, i used kdiff3, and it was workable, tho still not the most straightforward of tools for sure.
otherwise i stick to fixing conflicts directly in plaintext in nano
@outfrost Hm, I should check out kdiff3, thanks. I knew it existed but there was a little flag in my head saying "Doesn't work on Windows, don't bother" and the flag never got reset when I switched to Linux
@outfrost The thing I mainly use FileMerge.app/Meld for is actually not merges but "I have a large and complicated diff, and I've just realized exactly 50% of the lines in one file are wrong and need to be reverted".
Sometimes, as a variant of this, I use it for "I have just written a large and complicated diff, which I've just realized should actually be three separate diffs doing one non-complicated thing each, and I need to split those subfeatures out one at a time"
@mcc i see
my goto thing for that is git (add|reset|checkout) -p
ik probably not the answer you're looking for 😜 i just got really used to the cli
I should write vimdiff but nano