Tootfinder

Something that just drives me up the wall about this particular area of Git (merge conflicts) is that, beyond the all-too-typical Git problem of sloppy terminology, this is bad feature design. In most situations, “use ours” and “user theirs” are •both• the wrong answer! There are two doors, and they’re •both• trapdoors.
If you have a merge conflict, that means that you changed something •and• somebody else changed something, and your job is to •synthesize• both changes. To use one is to discard the other, which is usually not what you want!
The thing Git (and every Git GUI) ought to surface is a three-way merge: show me what I changed and what they changed ••relative to the nearest common ancestor••. Yes yes yes, I know it’s possible to finagle that into view with Git. It should be the danged default. It is what I should see first. It is what I should see if I have no idea what I’m doing.
1/ https://hachyderm.io/@jeremydmiller/115741417416659492

My top debian-derived linux tip is to uncomment the bash completion bits in /etc/bash.bashrc
It enables tab completion for a bunch of commandline stuff that saves loads of time
No idea why this isn't enabled by default. Setting up a new linux mint install for me these days is basically just doing that and mapping caps lock to ctrl.

So I've a medical thing that I need to buy once a month on Amazon and they cancelled my subscription delivery for it last time (but not the subscription itself), without telling me.
I tried to just order it for one time delivery, but the delivery date was a month out and they immediately cancelled my order.
My wife told me to use my developer brain—and yes, imagining a bug with some row in a database being in a fugue state, the exactly a month out delivery date being the biggest hint to something going into a default state when a calculation fails.
So I removed the subscription to the item (they make it hard to find where to do this).
Bingo: I can now order immediately for delivery in two days and for working subscrpition delivery.

#Trump has turned ICE into a sprawling paramilitary that roves the country at will, (...), and has been told that it enjoys “absolute immunity.” He more than doubled the agency’s size in 2025, and its budget is now larger than those of all other federal law-enforcement agencies combined, and larger than the entire military budgets of all but 15 countries.

Yes, It’s Fascism
Until recently, I thought it a term best avoided. But now, the resemblances are too many and too strong to deny.