## Why `origin/main` and `origin/dev` have **diverged**: - **Only on `main` (8):** `release/0.4.10` prep, tag bump `0.4.10+2`, CI #321, bumps `0.4.11+3` / `0.4.12+4` - **Only on `dev` (27):** product work #323–#340 `dev` pubspec is still **`0.4.9+1`** — incorrect vs Latest Release 0.4.10. ## Tasks - [ ] `git checkout dev && git merge origin/main` (resolve CHANGELOG/pubspec carefully) - [ ] After merge: pubspec target for release work = **`0.4.11+N`** (reset misleading 0.4.12 build if needed) - [ ] Restore/keep `[0.4.10]` changelog from `main`; draft `[0.4.11]` from `dev` commits - [ ] Push `dev`; ensure CI green Parent epic: #341
Why
origin/mainandorigin/devhave diverged:main(8):release/0.4.10prep, tag bump0.4.10+2, CI ci(release): fix Release workflow parse error for secrets in if #321, bumps0.4.11+3/0.4.12+4dev(27): product work enhancement(marketplace): extend SDUI RPC protocol with getCapabilities, getServerStats, getObjectDDL, and cancelQuery #323–feat(ui): harden empty workspace and shell overlays (#339) #340devpubspec is still0.4.9+1— incorrect vs Latest Release 0.4.10.Tasks
git checkout dev && git merge origin/main(resolve CHANGELOG/pubspec carefully)0.4.11+N(reset misleading 0.4.12 build if needed)[0.4.10]changelog frommain; draft[0.4.11]fromdevcommitsdev; ensure CI greenParent epic: #341