

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