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

@blakes7bot@mas.torpidity.net
2025-12-17 16:08:51

Series A, Episode 02 - Space Fall
VILA: I got confused.
DAINER: [To the prisoners there] Hands on your heads. Now move. Single file.
LEYLAN: [To Raiker] They're still in there?
RAIKER: Yes, sir.
blake.torpidity.net/m/102/353 B7B4

Claude Sonnet 4.5 describes the image as: "This image appears to be from a science fiction television production, likely from the late 1970s or early 1980s based on the video quality and production style. The scene shows several people with their hands raised in what appears to be a gesture of surrender or greeting. The setting is minimalist, with plain gray walls creating a stark, institutional atmosphere typical of sci-fi sets from this era. The actors are wearing casual, tunic-style costum…
@kurtsh@mastodon.social
2025-12-19 04:27:21

OMG, extreme hot wings Irish comedians = AWESOME? YES SIR!
Two of my favorite channels-in-one! 😜
▶️ Irish People Try Hot Ones' The Last Dab Hot Sauces - Try Channel
youtube.com/watch?v=aVbqwALUpn

@tezoatlipoca@mas.to
2025-12-18 22:13:21

Good website #uber guys...
I needed to update my password. Then I couldn't go back (yes yes, outside of my browser's back button)

The "Manage your profile" page of the Uber service. There is no link to return to the main page of one's uber account (showing rides taken etc.), and since the account management page opens in the same tab the main service page was in, you must use your browser's back button. The very helpful AI assistant had asked "Ask me anything about your Uber account", to which I asked "how do I get back to the main uber page" The AI's response was I'm here to help with account management tasks lik…
@beoz@det.social
2026-01-18 15:07:13

Kann mich morgen jemand daran erinnern, dass ich noch einen Trööt rauslassen muss mit dem Inhalt, dass es nur noch 12 Jahre dauert bis zur drohenden #Epochalypse ? Sonst heisst es an der Mitgliederversammlung am Abend wieder: Du hattest EINE Aufgabe!
#y2k38

@yaxu@post.lurk.org
2025-12-17 13:58:55

7 years ago, I got a room full of people in Sheffield to sing the red flag, o tannenbaum and o christmas tree simultaneously, while I played with the chords in @… (they all have the same tune)
More info here:

@kexpmusicbot@mastodonapp.uk
2026-01-17 12:58:08

🇺🇦 #NowPlaying on KEXP's #VarietyMix
Yoko Ono:
🎵 Nobody Sees Me Like You Do
#YokoOno
thehoneyhivegallery.bandcamp.c
open.spotify.com/track/7aPINKQ

@thomasfuchs@hachyderm.io
2026-01-17 21:50:38

I implore you to take the batteries out of electronics in storage
yuck

@midtsveen@social.linux.pizza
2025-11-17 20:09:50

Yes, Warframe is coming to Android this November! My Pixel9a is supported, and I can’t wait to try it out, especially to see if it even runs on GrapheneOS, my preferred alternative OS.
warframe.com/android

@thomasfuchs@hachyderm.io
2025-11-18 17:22:57

I just installed Windows 3.11 for Workgroups (in an emulator), how's your day going
Fun Y2K bug btw