Skip to content

Sync main → stage (resolve duplicate sui-grpc redirect history)#1947

Merged
mikhailak merged 3 commits into
stagefrom
sync/main-into-stage-2026-05-11
May 11, 2026
Merged

Sync main → stage (resolve duplicate sui-grpc redirect history)#1947
mikhailak merged 3 commits into
stagefrom
sync/main-into-stage-2026-05-11

Conversation

@mikhailak
Copy link
Copy Markdown
Contributor

Summary

Merge origin/main into stage to reconcile history divergence caused by the duplicate sui-grpc redirect fix:

  • #1939 (on stage): fix: correct sui-grpc redirect to match docs pattern
  • #1942 (on main, direct hotfix): same fix via different commit

Two minor content conflicts in sui/grpc.mdx and sui/index.mdx — both resolved by accepting stage's version, which strictly supersedes main (adds JSON-RPC deprecation notice from #1944 + Regions tables). Main had no competing content for those sections; conflict was purely line-adjacency.

Unblocks subsequent stage → main PR (#1946 was closed due to this divergence).

Test plan

  • CI passes on stage after merge
  • Sui pages still render JSON-RPC deprecation notice + Regions table
  • Kite AI page still present

mikhailak and others added 3 commits March 25, 2026 11:58
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
# Conflicts:
#	pages/rpc-service/chains/chains-api/sui/grpc.mdx
#	pages/rpc-service/chains/chains-api/sui/index.mdx
@mikhailak mikhailak merged commit de295ab into stage May 11, 2026
@mikhailak mikhailak deleted the sync/main-into-stage-2026-05-11 branch May 11, 2026 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants