@Techmeme@techhub.social2025-12-18 17:55:49
Netflix hires ESPN anchor Elle Duncan as its first on-air host for live sports and cultural events; she has appeared on SportsCenter, College GameDay, and more (Todd Spangler/Variety)
https://variety.com/2025/tv/news/netflix-hires-espn-elle-duncan-sp…
@inthehands@hachyderm.io2025-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/ https://hachyderm.io/@jeremydmiller/115741417416659492
@heiseonline@social.heise.de2025-12-19 06:15:07
Noch einige der zuletzt hier besonders häufig geteilten #News:
WhatsApp und Signal: Privatsphäre angreifbar, Tracker-Software verfügbar
@Mediagazer@mstdn.social2025-12-18 17:40:53
Netflix hires ESPN anchor Elle Duncan as its first on-air host for live sports and cultural events; she has appeared on SportsCenter, College GameDay, and more (Todd Spangler/Variety)
https://variety.com/2025/tv/news/netflix-hires-espn-elle-duncan-sp…
@Dragofix@veganism.social2025-12-20 01:56:31
Noisy traffic is making Galšpagos’ yellow warblers angry https://news.mongabay.com/short-article/2025/12/noisy-traffic-is-making-galapagos-yellow-warblers-angry/
@memeorandum@universeodon.com2026-02-18 18:45:55
NEW: Senators Markey, Merkley, Murphy, Smith, Van Hollen, Reps. Ansari, Balint, Casar, Escobar, Jayapal, Ramirez, Watson Coleman, and More Boycott SOTU (MoveOn)
https://front.moveon.org/new-senators-markey-merkley-murphy-smith-van-hollen-reps-ansari-balint-casar-escobar-jayapal-ramirez-watson-coleman-and-more-boycott-sotu/
http://www.memeorandum.com/260218/p68#a260218p68
@jby@ecoevo.social2026-02-18 23:56:16
My department at CSU Northridge is hiring a vertebrate functional morphologist! We've got a great EEB group, and we're looking for someone to carry forward a tradition of enriching organismal courses and community-engaged research. App review starts March 15
I'm not on the hiring committee, but happy to answer questions about the department, campus, and life in Los Angeles
@Techmeme@techhub.social2026-02-20 13:30:46
Scott Myers, the head of Snap's AR glasses subsidiary Specs, leaves after six years; sources say Myers left after a "blow-up" with Evan Spiegel over strategy (Alex Heath/Sources)
https://sources.news/p/figmas-answer-to-the-ai-software
@inthehands@hachyderm.io2026-01-19 02:41:31
Here in Minneapolis, in some ways it’s already happening: people are putting so many hours into community work, and are so exhausted and distracted when they’re at their jobs, now normal life is…well, not shut down, but severely compromised. But that’s necessity. Life continues even in war zones far more dire than this one.
I am talking about something else: shutting down normal life not out of necessity but by choice, in righteous anger.
11/
@heiseonline@social.heise.de2026-02-19 16:45:57
Einige der zuletzt hier besonders häufig geteilten #News:
Notepad : Sicherheitsupdate gegen Codeschmuggel-Lücke
https://www…