Summary
develop in flow_mobile was advanced from the April brand-strategy
commit to the editorial-redesign rollup so a collaborator can build
new mobile work on top of the latest consolidated code. This was a clean
fast-forward — no merge, no history rewrite, fully reversible.
What moved
| Before | After | |
|---|---|---|
develop tip | b78aef3 (2026-04-20, brand strategy) | 7fe531c (editorial-redesign release point) |
| Distance | — | 111 commits ahead, 0 behind |
Source branch: edit/mobile-audit-ux-polish (the integration branch where
recent work had already been layered up).
git push origin edit/mobile-audit-ux-polish:develop # fast-forward
git branch -f develop edit/mobile-audit-ux-polish # align localLocal develop and origin/develop are in sync (0/0) after the push.
What is included
The rollup already contained 7 of the 8 recent restyling/design
branches (verified via merge-base --is-ancestor):
feat/restyling-theme,feat/restyling-shared-widgetsfeat/restyling-l1,feat/restyling-l2-{chat,events,misc,profile}- the 2026-05-20 auth screens redesign (unified branded inputs + CTA hierarchy) — see auth-screens
- the broader UX-polish audit — see audit-2026-04-20-ux-polish
What is excluded — and why
feat/design-system-v2was deliberately left outThose 5 commits (2026-05-04) are a superseded parallel redesign of
login,welcome,public_profile,ticket_wallet, andnotifications. Every one of those screens was re-touched later in the rollup (auth screens on 2026-05-20, profile/wallet icon migration on 2026-05-05). Merging it would conflict on all of them and risk reverting the newer auth redesign back to older code.
If a specific visual idea from design-system-v2 is worth keeping (e.g.
the gradient cover on the public profile), the right move is a targeted
cherry-pick into its own branch later — not a bulk merge into develop.
Collaboration note
A collaborator picks this up with git checkout develop && git pull.
This follows the branch-strategy convention: shared
integration on develop, feature work on branches off it.