Trunk-Based Development is the standard everyone commercial software project should aim for.

Can disabling this feature be a small win for your team?

Feature flags can be powerful. But they aren't free.

It can be valuable to expose it to a small subset of users. Perhaps a single user.

Although they do easily overcome a common objection.

... or do we?

Survey says...

Is it just a "server"?

I always rebase my feature branches, rather than merging them. Except when I don't.

My simple rules for when to rebase or merge

If you must merge or rebase... here's when to merge.