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

from my link log —
Spinlocks considered harmful in Rust.
https://matklad.github.io//2020/01/02/spinlocks-considered-harmful.html
saved 2020-01-03

arxiv_citation: arXiv citation networks (1993-2003)
Citations among papers posted on arxiv.org under the hep-ph and hep-th categories, between 1993 and 2003. This time begins a few months after axiv was launched. If a paper i cites a paper j also in this data set, then a directed edge connects i to j. (Papers not in the data set are excluded.) These data were originally released as part of the 2003 KDD Cup.
This network has 34546 nodes and 421578 edges.
Tags: Informational,…

Gloom & Bloom V ☁️🌺
黑暗绽放 V ☁️ 🌺
📷 Nikon F4E
🎞️ Ilford HP5 400 Plus, expired 1993
#filmphotography #Photography #blackandwhite

Fun fact, your computer doesn't have USB ports (USB is a protocol, not a connector).
Funner fact, even if your computer has USB-C receptacles it might not be using any type of USB as protocol for a specific connection.
Funnest fact, there's at least a dozen different types of cables that use USB-C plugs with various capabilities, sometimes mutually incompatible and often silently falling back to slower protocols.

Reminder: You can let Mozilla know what you think about AI and other stupid shit.
https://connect.mozilla.org/t5/discussions/building-ai-the-firefox-way-shaping-what-s-next-together/td-p/109922
(Edited to fix li…

Building AI the Firefox way: Shaping what’s next together
Hi everyone, We recently shared how we’re approaching AI in Firefox with user choice and openness at the center of everything we build. We’ve heard from many of you who’d prefer not to have AI in your browser at all, and we get it: We will soon provide additional settings for you to control how AI i...

Should the Cowboys consider newly released Pro Bowler Bradley Chubb? https://insidethestar.com/should-the-cowboys-consider-newly-released-pro-bowler-bradley-chubb

“This precedent could result in people facing terrorism charges for doing very simple mainstream activism.”
There is no doubt a police officer was shot at the Texas protest.
Prosecutors have brought charges against people they say helped the alleged shooter escape.
But the case has drawn considerable alarm because of the way that prosecutors have sought to create a criminal enterprise
– a “North Texas antifa cell”
– among a group of demonstrators who were uninv…

november17: November17 members (2009)
A network representing connections among members of the November 17 (N17) Greek terrorist group. Nodes are members, and an edge exists if two members have some connection in the past. Metadata include role, function, resources. Some attributes are missing.
This network has 22 nodes and 66 edges.
Tags: Social, Offline, Unweighted, Metadata

“sudden, brutal and terrifying”
ACLU hits ICE with what will be the first of multiple legal actions over ICE’s illegal and unacceptable behavior in Minnesota.
My hope is that this is the road to an injunction.
https://www.cbsnews.com/minnesota/news/aclu-minnesota-accuses-ice-of-violating-constitutional-rights/