Step 1 / 3

Two independent branches

`feature` has a specific commit `c4` — a critical bug fix — that we need on `main` immediately, without merging everything else.