Skip to content

Merge to main for release#2400

Merged
normj merged 17 commits into
masterfrom
dev
Jun 1, 2026
Merged

Merge to main for release#2400
normj merged 17 commits into
masterfrom
dev

Conversation

@normj
Copy link
Copy Markdown
Member

@normj normj commented Jun 1, 2026

The normal GitHub action to sync dev and master after a release PR failed due to merge conflict issue. So manually creating the sync PR and resolving merge conflicts.

@normj normj requested review from a team as code owners June 1, 2026 19:20
@normj normj requested review from GarrettBeatty and philasmar June 1, 2026 19:20
@normj normj added the Release Not Needed Add this label if a PR does not need to be released. label Jun 1, 2026
@normj normj merged commit 3a4930c into master Jun 1, 2026
14 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release Not Needed Add this label if a PR does not need to be released.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants