Brings 342 commits of master (last merge base 2026-06-09) onto the rebrand
branch. 10 files conflicted; resolutions below.
Regenerated rather than merged (both are build artifacts):
static/css/devportal2024-v1.css rebuilt via `npm run build-css` (+ .css.map,
which both branches track)
package-lock.json seeded from master, `npm install`
Config/nav:
.gitignore union of both sides
redirects.yaml took master's side: ambassadors.html now points at
ripple.com/impact/ubri/ (supersedes the branch's interim
redirect to /community/developer-funding) and master's
rippled->xrpld redirect block is preserved
redocly.yaml union of ignore entries (branch showcase/** + master
.claude/**); kept the branch's script ordering/defer flags
but adopted MASTER's new Osano CMP URL - taking the branch
side wholesale would have silently reverted cookie consent
top-nav.yaml kept the branch's restructure; master's only changes there
were the TypeScript get-started entry (auto-merged, retained)
and removing Ambassadors (branch already omits it)
Pages/styles:
docs/index.page.tsx, community/index.page.tsx,
community/developer-funding.page.tsx, styles/_docs-landing.scss
kept the branch rewrites, then re-applied master's intent:
"rippled API" -> "xrpld API" in docs/index.page.tsx. Master's
other edits (validator link rename, funding-orange image
removal, .nav-link hover underline removal) were already
satisfied by the rewrites.
Semantic conflict git did not flag:
styles/_tutorials.scss auto-merged cleanly but broke the SCSS build. Master
added light-mode .tutorial-tabs rules using $blue-purple-600/700, which the
rebrand's token consolidation removed (scale now stops at 500, aliased to
$lilac-*). Remapped to $blue-purple-500, matching how the rebrand migrated
the other light-mode $blue-purple-600 usages in the same file.
Verified: `npm run build-css` succeeds; no conflict markers remain; the set of
files still linking to master's renamed rippled-* doc paths is identical to
master's own (49 files, all historical blog posts covered by redirects).
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
