trem

joined 1 week ago
[–] trem@lemmy.blahaj.zone 4 points 9 hours ago

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

[–] trem@lemmy.blahaj.zone 6 points 1 day ago (1 children)

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.

[–] trem@lemmy.blahaj.zone 1 points 1 day ago

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.

[–] trem@lemmy.blahaj.zone 13 points 1 day ago* (last edited 1 day ago) (2 children)
[–] trem@lemmy.blahaj.zone 4 points 1 day ago

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...

[–] trem@lemmy.blahaj.zone 5 points 1 day ago* (last edited 1 day ago)

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.)

[–] trem@lemmy.blahaj.zone 3 points 1 day ago (1 children)

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

[–] trem@lemmy.blahaj.zone 3 points 1 day ago

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...

[–] trem@lemmy.blahaj.zone 10 points 1 day ago

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

[–] trem@lemmy.blahaj.zone 5 points 1 day ago

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...

view more: next ›