Det er tŸys at strikketŸy som klikker er like drŸyt som trikkestŸy. Ikke gŸy!
#tungegymnastikk #norsktut
🇺🇦 #NowPlaying on KEXP's #MiddayShow
Nourished by Time:
🎵 The Passionate Ones
#NourishedbyTime
https://nourishedbytime.bandcamp.com/track/max-potential
> So, the system has been deliberately configured to transmit the location of the nearest tube station, where access can be arranged. That’s why sometimes you might check your smartphone map, and it will display the “wrong” location, because that’s the best one for a 999 call to use.
h…
(And they eat garbage.)
Rules of the game:
- Grab the nearest book.
- Turn to page 42
- Find the 2nd sentence
- Post the sentence in a toot with the hashtag & write the rules as a comment to it
- Don't look for your favourite, coolest or wittiest book. Go for the closest.
#page42
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
🇺🇦 #NowPlaying on KEXP's #VarietyMix
Nourished by Time:
🎵 When the War Is Over
#NourishedbyTime
https://nourishedbytime.bandcamp.com/track/when-the-war-is-over
https://open.spotify.com/track/6CSpmRlGT82RrGNJotD9gJ
🇺🇦 #NowPlaying on KEXP's #AfternoonShow
Nourished By Time:
🎵 9 2 5
#NourishedByTime
https://nourishedbytime.bandcamp.com/track/9-2-5
https://open.spotify.com/track/6IzuJx4beJwcP9ImbZsKYd