A reasonable outcome we should keep in mind for future reference.
Former South Korean president Yoon Suk Yeol gets life sentence over martial law attempt
https://www.cnbc.com/2026/02/19/south-korea-ex-president-yoon-suk-yeol-life-sentence-guilty-insurrection-death-sentence-martial-law-verdict.html
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
🇺🇦 Auf radioeins läuft...
Santana:
🎵 Samba pa ti
#NowPlaying #Santana
https://pepedub.bandcamp.com/track/carlos-santana-samba-pa-ti-pepe-dub-bootleg
https://open.spotify.com/track/35fC3Wq3slX4OBfyvBVmHm
South Korea‘s former President Yoon Suk Yeol sentenced to life imprisonment for leading an insurrection.
https://m.koreaherald.com/article/10678550
🇺🇦 #NowPlaying on KEXP's #AstralPlane
Sean Thomson:
🎵 Joy to the World
#SeanThomson
https://seanthomson.bandcamp.com/track/joy-to-the-world-2
https://open.spotify.com/track/2HSmel0jqXCXvqT7HyImu9
Remitly co-founder Matt Oppenheimer steps down as CEO, will be succeeded by Banco Santander executive Sebastian Gunningham (Bloomberg)
https://www.bloomberg.com/news/articles/2026-02-18/remitly-ceo-steps-down-succeeded-by-banco…
There is a massive focus on trying to get Open Source software to the point where governments or big corporations can use them to "increase sovereignty" (which sometimes means a bit of a weird mix of things).
But that can lead to software being pushed towards more and more complex architectures and deployment strategies (think something like a simple collaborative editor needing Kubernetes to be deployable). While governments and certain companies might be able to shoulder tha…
Sometimes I do things that I’m proud of. Sometimes, not always. Maybe I just have high standards set for myself…I don’t know.
Then there are people who are proud of their country and all they ever did was be born there, which wasn’t even their choice really.
Those people are psychopaths.
Pride should come from the actions you take, not your surrounding circumstances.
For the love of all you hold sacred.
Can we please adopt a UNIVERSAL standard for generating a new line in a web text box - sometimes its cmd-enter, sometimes its shift-enter sometimes you just can’t do it 😡
rest assured if you invoke the wrong key combo, there is a 99.999% probability that the form will be submitted with potentially disastrous results.