Skip to content

Sync main with NordSecurity upstream - #6

Closed
alan-george-lk wants to merge 2 commits into
mainfrom
livekit/sync-upstream-main
Closed

alan-george-lk wants to merge 2 commits into
mainfrom
livekit/sync-upstream-main

Conversation

@alan-george-lk

Copy link
Copy Markdown
Collaborator

The fork's main is two commits behind NordSecurity/main. This branch points to upstream commit c592133 and includes the UniFFI v0.31.0 update and its upstream merge commit.

A direct fast-forward sync was rejected by LiveKit's organization ruleset default (4151996), which requires a reviewed pull request and linear history. Upstream's merge commit violates the linear-history rule.

To preserve identical upstream history, an organization administrator must permit the fast-forward sync through an authorized ruleset bypass or exception. Squashing or rebasing this PR can bring over the changes, but will leave the fork with different commit history from upstream. A normal merge also creates a different tip.

Validation: fetched both remotes and verified fork main is 0 commits ahead and 2 behind upstream. No source changes were made; local tests were not rerun. The working checkout remains on livekit/dev.

arn0st added 2 commits October 6, 2026 09:15
Signed-off-by: Ernesto Domingo Fuentes <ernesto.fuentes@nordsec.com>
@CLAassistant

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

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.

3 participants