@whereistanya That sounds about right, I get Grammarly and LNER ads, which has got to be residential North London during the daytime targeting.
I learned today about the experimental novelist B. S. Johnson*, who made books that had things like holes in pages so you could see what was going to happen later in the book or middle chapters that you could read in any order, which sound fascinating. I’m also really curious if he had any part in inspiring Bloody Stupid Johnson from Discworld.
@lindsey Hooray!
@mjd My objection to the sun moving clockwise across the sky is not that I think it moves counterclockwise, but that it obviously doesn't move at all. If you look at it, it's clearly stationary. Yes, it's at different places in the sky at different times of day, but it's definitely not moving.
(This is pretty much my instinctual feelings about the sun, I think because I spend so little time outdoors in a single place paying attention to it, so I effectively never experience motion.)
@hotdogsladies Be sure to add salt!
@b0rk I don’t use third-party tools much, but git-reparent is the one I use most often
@jacob I’ve had multiple cases where a lawyer would meet with me or a friend for free, in both UK and US. Example areas are immigration, contract disputes, and tax. These are “Do I need a lawyer/what would you do for me as my lawyer?” meetings, which I assume are the sorts of meetings people are referring to?
@jacob Something I find fascinating is that this is not an uncommon feeling about git, and yet it is by far the most popular tool of its type. Most tools that are as difficult to use as git is would be thrown away, but git somehow is powerful enough or entrenched enough or something to avoid that, and that’s sort of amazing.
@gruber I don’t think you’re wrong that Apple execs didn’t know it was happening, but I’m delighted by the idea that Apple’s low-oversight capricious App Store management is screwing them for once rather than some poor developer.
@Graham_LRR I am amazed at the number of people that care deeply about this
@b0rk I do your #4: run git diff to see what each one changed. If it’s not obvious which one of the options is correct, I want to see the whole change to put each option in context, even if other parts merged cleanly.
@b0rk For me it’s sort of #1 and the opposite of it. Most merge conflicts are trivial and it’s easy to edit the file. Most of the remainder are complex merges where the correct code needs to be reasoned through and ends up as more than a combination of the two conflicting changes. The ones in the middle are the ones where I’d expect to see benefit from a dedicated tool, but I find those to be too rare to bother learning a new tool.
@hotdogsladies I very fondly remember the Pacific Campaign episodes. Lots of formative memories of plane icons lined up next to flags. You’re in for a treat!
Software engineering manager at Cord. Counterculture-adjacent. Strong opinions, rarely tooted. (he/him)