Skip to content

Sync downstream fork with upstream main#50

Merged
OneNoted merged 3 commits into
OneNoted:mainfrom
SequoiaWynncraft:main
May 10, 2026
Merged

Sync downstream fork with upstream main#50
OneNoted merged 3 commits into
OneNoted:mainfrom
SequoiaWynncraft:main

Conversation

@OneNoted
Copy link
Copy Markdown
Owner

@OneNoted OneNoted commented May 10, 2026

Summary

  • Syncs SequoiaWynncraft/sequoia-map:main with current upstream OneNoted/sequoia-map:main.
  • Clears the previous merge conflict state by fast-forwarding the fork branch through an upstream merge commit.
  • Leaves no remaining code diff against upstream after the sync.

Validation

  • cargo test -p sequoia-server

@greptile-apps
Copy link
Copy Markdown
Contributor

greptile-apps Bot commented May 10, 2026

No reviewable files after applying ignore patterns.

@OneNoted OneNoted changed the title sync with upstream Sync downstream fork with upstream main May 10, 2026
@OneNoted OneNoted merged commit 256840b into OneNoted:main May 10, 2026
1 check passed
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.

1 participant