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

Bring develop up to main #389

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open

Bring develop up to main #389

wants to merge 18 commits into from

Conversation

hiker
Copy link
Collaborator

@hiker hiker commented Feb 14, 2025

This PR is only to bring develop up to master. I realised that when one older PR got merged into main, we've updated the individual PRs that follow, but we never updated develop, so develop misses all the changes asked for in the code review on master.

This should bring the latest changes from main into master.

I'd guess in the future when a new PR is merged into master, we might have to:

  1. bring all follow-up PRs up to date (by merging main into branch1, branch1 into branch2, ... (which is what we have been doing)
  2. merge at least branch1 into develop again (and if there should be conflicts in further branches that were resolved in step 1, I guess we merge this all back in.

@hiker hiker requested a review from jasonjunweilyu February 14, 2025 22: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