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

Hey everyone,
@… and I had the honour of speaking to @… today and would like to welcome her and her family to Gaza Verified.
She’s an architect who, due to the war, has lost her job and must now support her family …

Gaza Verified
We’ve personally had video conversations on Signal with the people from Gaza whose Mastodon accounts on the fediverse are listed here and we verify that their accounts are genuine. – Joy & Aral Balkan

Mike Johnson’s refusal to swear in Adelina Grivalja for this long
—much less communicate with those on the other side of the aisle
—is a failure of leadership and a stunning betrayal of basic democratic principles
https://bsky.app/profile/theswprincess.bsky.so…

Leia🇨🇴🇺🇸 (@theswprincess.bsky.social)
Mike Johnson sent everyone home & refuses to talk to Democrats. “There’s absolutely no reason for the House to be out of session,” said GOP Rep. Kevin Kiley. He’s stalling Adelita Grivalja’s swearing in to avoid a vote on the Epstein files. Most people get fired for not doing their job.

#DearLazyWeb: Hey #Nederlanders ik heb en expat vrag over mijn #VvE. Our management company is absolute garbage. Our VVE management company recently scheduled repainting, during winter, with the most incompetent company possible, who did a horrible job, some of which didn't need to be done. Our windows had just been repainted since they were painted before we moved in, so 1/3 of the work they did was unnecessary, and now they look much worse than they did before. I could go on, but generally lots and lots of complaints along with absolutely terrible service.
Our upstairs neighbor (also an owner) also hates them and wants to switch, but a rental company owns the top half of the building and seems to be trying to force us in to staying. Basically, this management company is super cheap and the rental company are absolutely trash absentee leaches. (They *may* also have not been paying their part of the VvE fees for a while, but I'm not totally sure I understood everything.)
Unfortunately, I am way out of my depth and can't seem to get much help from google. Can anyone give me some advice about what to read or who to talk to, or are we actually stuck?

OpenAI unveils GPT-5.1-Codex-Max, saying it is "significantly better" at "long-horizon reasoning" and is the first model it has trained for Windows environments (David Gewirtz/ZDNET)
https://www.zdnet.com/article/op…

OpenAI's Codex Max solves one of my biggest AI coding annoyances - and adds dramatically faster performance
GPT-5.1-Codex-Max is ready to take on your next massive coding job. Here's what's new.

Ein Tabak-Lobbyist spricht sich gegen das #Nichtraucher-freundliche Votum eines #Bürgerrat|s aus. Ist ok, das ist sein Job. Aber was ist dran an dem Vorwurf, der Rat sei nicht repräsentativ? Auf bundestag.de wird klar, dass es darum gar nicht geht.

A sleepy great blue heron, Areda herodias, in the Seattle Arboretum's Japanese garden
#naturalist

🇺🇦 #NowPlaying on KEXP's #Early
U2:
🎵 Bad
#U2
https://theartsmixof.bandcamp.com/track/u2-bad-the-art-mix-jvu-edit

Q&A with Christopher Anderson, who photographed Trump's inner circle for VF: "My job is to ... draw on my experience as a journalist and photograph what I see" (Shane O'Neill/Washington Post)
https://www.washingtonpost.com/style/power

The Vanity Fair photographer who disrupted Trumpworld’s polished image
Christopher Anderson, who photographed Trump’s team at the White House for Vanity Fair, defends his unvarnished — and extreme — close-ups.

I’ve been really interested in both aspects of this post:
1. ICE right-wing fringe groups conspicuously steered clear of protests yesterday in a way that suggests that orders went out (whose?) and/or (I’m guessing “and”) that there’s a sense from those people that they don’t have public support and don’t have free license to instigate violence.
2. Police went out of their way to put on a friendly face. I’ve been getting vibes that some local police resent ICE — “this is OUR turf, beating up Black and brown people was OUR job” — and, contrary to what we and the regime might expect, ICE isn’t always getting free support by default from that quarter.
Caveats: No solid conclusions here, just reading vibes. And even if it is actually true for now, all of this can shift on a dime. Still, sure is notable. https://fed.brid.gy/r/https://bsky.app/profile/did:plc:mxc7liuon6iq5gzapmmwkq22/post/3m3krd3w4s22k