Ah, that makes more sense. I did remember it being a Dutch acquisition.

Dutch cartographers subsequently renamed Tasman’s discovery Nova Zeelandia from Latin, after the Dutch province of Zeeland. This name was later anglicised to New Zealand.

https://en.wikipedia.org/wiki/New_Zealand#Etymology

https://en.wikipedia.org/wiki/Zealand

If it’s brandname Jell-O, then the brand might know how much they’re delivering to each store…

I mean, without knowing the details what your scrum master does, that feels more like a ‘product owner’ role to me.

But to be fair, I’m also not sure, what the ‘scrum master’ role is actually supposed to do. Some say, scrum masters really need to be deeply involved in the whole project to be able to question/assist the way of working.
And then there’s the reality at my company, which is that scrum masters often have 10+ projects, where they just hop between meetings to host them, while hardly being able to contribute anything…

I imagine, this is more about software devs than sysadmins. Sure, you’ll hire a couple more sysadmins to help with the massive user growth during the pandemic. But especially combined with loans basically being made free in the same time, it’s suddenly worth hiring a bunch of devs to build the Next Big Thing™.

Once those loans start costing again and the user numbers fall off, you quickly have lots of devs that you can’t find tasks for, that are worth doing.

Also worth mentioning that universities generally see themselves as research facilities first and foremost. They teach students, because they want to get the next generation of researchers.

Sure, they’ll also do job training to some degree, because it’s a good argument to get more funding, but yeah, just not their primary goal.

I feel like that’s exactly why we don’t have a generally-accepted definition of consciousness. Western ethics assigns special protection to whatever is conscious, so it is convenient to come up with a definition of consciousness, which excludes groups you want to exploit.

I guess, you didn’t claim otherwise, but just to point out that there’s actually also a genetic change in cultures that have consumed dairy for longer:

In northern European countries, early adoption of dairy farming conferred a selective evolutionary advantage to individuals that could tolerate lactose. This led to higher frequencies of lactose tolerance in these countries. For example, almost 100% of Irish people are predicted to be lactose tolerant.

https://en.wikipedia.org/wiki/Lactose_intolerance

I did find it quite weird that the most powerful stage for Digimon was often just a man. Always felt like the, uh, cartoonist(?) had a bit of a superiority complex. Like, what’s more powerful than an iron t-rex? An iron man, of course.

Although, thinking now, there was something about them merging with their humans. Was that just what that last stage is? Then I guess, I would allow it as some dramatic thingamabob.

You’re right that there is a risk, that rebasing introduces compile errors or even subtle breakages. The thing is, version control works best, if you keep the number of different versions to a minimum. That means merging back as soon as possible. And rebases simultaneously help with that, but also definitely work best when doing that.

There may be reasons why you cannot merge back quickly, typically organizational reasons why your devs can’t establish close-knit communication to avoid conflicts that way, or just not enough automation in testing. In that case, merges may be the right choice.
But I will always encourage folks to merge back as soon as possible, and if you can bring down the lifetime of feature branches (or ideally eliminate them entirely), then rebases are unlikely to introduces unintended changes and speed you up quite a bit.

I don’t work with merges, so maybe I’m way off base, but I thought they meant, they’re working on another branch or fork, then merging the base branch into theirs every so often to get the newest changes, and then that creates multiple merge commits, which they can’t squash at the end…?

I’m not sure, about that last part, but the rest, I’ve definitely seen with contributors that didn’t know to work with rebases (and unfortunately we’re on GitHub, which only half-assedly supports working with rebases by default).

Damn, I had a feeling, it was Titanic, because of the eerie lighting, but I’ve never watched it, never seen this scene.

I guess, it did narrow things down, though, that it’s posted here without explanation…

Hmm, well, thanks for throwing that tidbit in either way. I’m certainly not deep into that whole artform, so probably just saw big eyes + cat ears and that was the end of my thought process. 🫠

You might prefer working with rebases + fast-forward-only merges, if you want merge commits to be squashed…

(As in, there won’t be any merge commits. Your PR will look as if you forked, then coded real fast, and then opened the PR before anyone else pushed anything.)

Well, the advantage back then was that far fewer cars were on the road…

I mean, given that they didn’t see it in the screenshot, they might’ve thought that’s her real name rather than the name she uploads porn under…

Thought you switched to a Slavic language for a moment there…

I can understand goblins. If you train on fictional works, it’ll have fictional knowledge and occasionally consider that the best auto-completion. Raccoons, pidgeons and “other animals” is weird, though…