Huh, you fry the dry TVP? Do you then let it simmer in the sauce for as long as one would normally boil it?

I have some steak-like TVP here, which is going to remain dry in the core, unless you really give it its time, so not sure how well it would work with that.

I do also have (pre-)roasted TVP, though, where I assumed, they do that when extruding or something. Maybe they actually throw it into a big pan before shipping… 🤔

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

I’m guessing, it’s this: https://web.archive.org/web/20120619032849/http://arrangebypenis.com/

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

News article: https://en.rua.gr/2024/12/03/loud-arrest-in-moscow-a-robot-drug-courier-fell-into-the-hands-of-law-enforcement-officers/

I live in the year 2026, I’m pretty sure, and this still made so little sense to me, that I assumed they meant “hacking a water fountain” as in hitting it with an axe.