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
What if I implemented three-fifths of a native compiler for Python and if anyone asked why I did it I mumbled something about it being the incomplete step one of a plan to write a git replacement
@RussSharek You know, I've seen this page, but I ignored it because I was happy with Mercurial. But since (as I just said) I'm not currently satisfied with Mercurial, I reckon I *should* look at this.
@mcc After hearing people praise jj for a while now I finally tried it today. I tried to colocate a jj repo on an existing git repo and it just... Didn't do what the tutorial said it should? Like, on step 2. And I couldn't figure out why, despite a fair amount of searching. I feel like this should be the best documented path, if they want to lure devs away from git.
Why are computers like this?
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…
@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
I should write vimdiff but nano