Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync main with missing commits in develop #981

Merged
merged 94 commits into from
Jan 10, 2025
Merged

Sync main with missing commits in develop #981

merged 94 commits into from
Jan 10, 2025

Conversation

CJ42
Copy link
Member

@CJ42 CJ42 commented Oct 21, 2024

Opened as draft until PRs

Since we are planning to move away from the develop -> main flow, and just keep the main branch, this PR introduces all the PRs merged in develop into the main branch, so that main is up to date.

(It is currently not possible to merge develop in main due to merge conflicts, as after the monorepo release, some PRs were merged directly to main.

@CJ42 CJ42 marked this pull request as ready for review January 8, 2025 15:25
@CJ42 CJ42 force-pushed the sync-main-with-develop branch 6 times, most recently from 72fbf26 to 420bd9d Compare January 10, 2025 08:45
@CJ42 CJ42 force-pushed the sync-main-with-develop branch 5 times, most recently from c300eb4 to eddabf8 Compare January 10, 2025 20:47
@CJ42 CJ42 force-pushed the sync-main-with-develop branch from eddabf8 to 8d869a7 Compare January 10, 2025 20:49
@CJ42 CJ42 merged commit 20fd62c into main Jan 10, 2025
3 checks passed
@CJ42 CJ42 deleted the sync-main-with-develop branch January 10, 2025 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

8 participants