Tootfinder

Opt-in global Mastodon full text search. Join the index!

No exact results. Similar results found.
@inthehands@hachyderm.io
2025-12-18 17:03:18

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/ hachyderm.io/@jeremydmiller/11

@metacurity@infosec.exchange
2025-12-19 12:19:33

So the foreign power (cough, cough, Russia) might have tried to hack two Italian ferries.
Authorities in Naples arrested a second Latvian national on board a vessel in Naples, raising the prospect that two different ships may have been involved
maritime-executive.com/arti…

@thomasfuchs@hachyderm.io
2025-12-18 15:51:02

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.

@netzschleuder@social.skewed.de
2025-12-18 14:00:04

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

november17: November17 members (2009). 22 nodes, 66 edges. https://networks.skewed.de/net/november17

“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…

@scott@carfree.city
2025-12-19 22:38:13

"Tenants in rent-controlled apartments have the right to move back at their prior rents once renovations are completed. After fires, however, landlords often seize the opportunity to make more significant changes... unnecessary for a tenant to reoccupy.
"That extends the construction timeline by months or years... and landlords often hope tenants will just give up. Then, rent for new tenants goes up to market rates."

@mariyadelano@hachyderm.io
2025-12-18 16:28:36

It’s strange thinking about how much pain I’ve grown to accept and have just learned to live with.
I love writing by hand too much to give it up - with my ADHD it helps me focus, remember thins better, think through complex ideas. Journaling has been a great way to manage my mental illnesses. I love paper, I love collecting notebooks.
Not to mention that I am a hobbyist artist and draw on a regular basis. (Somehow that has been less painful for me than writing… but if writing cramped my hand then drawing would be agonizing too and I’d have to take weeks off on a nearly constant basis).
So suddenly purchasing a new kind of pen and realizing it MADE THE PAIN DISAPPEAR feels like magic. I literally feel less disabled.
I just wish I bought a fountain pen years ago 😅

@cosmos4u@scicomm.xyz
2026-02-18 19:02:43

ALMA and JWST Identification of Faint Dusty Star-forming Galaxies up to z ∼ 8 and Their Connection with Other Galaxy Populations: #galaxies almost 13 billion years old, helping to revise the history of the universe: umass.edu/news/article/interna

@fanf@mendeddrum.org
2026-02-17 15:42:01

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

Alan Dershowitz, a former lawyer for Trump, recently said in an interview that he and Trump have discussed the possibility of Trump running for a third term in office
— an action that would violate the U.S. Constitution.
“I said ‘it’s not clear if a president can become a third-term president and it’s not clear if it’s permissible,'”
Dershowitz recounted of his conversation with Trump.
Dershowitz, who was part of Trump’s legal team during his first impeachment tri…