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

Merge main into feature/wilms-tumor-06-azimuth #891

Conversation

sjspielman
Copy link
Member

This PR accomplishes Step 2 in #883: merge main into feature/wilms-tumor-06-azimuth for a better experience for step 3, merging feature/wilms-tumor-06-azimuth into main.

@sjspielman
Copy link
Member Author

Noting that module-specific workflows did not run here because we don't have feature/* as a target in their yaml files.

Copy link
Member

@jashapiro jashapiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did not carefully review, but assuming that this is what it says...

@sjspielman
Copy link
Member Author

but assuming that this is what it says...

Indeed, here's exactly how the sausage was made for this branch:

git switch feature/wilms-tumor-06-azimuth
git fetch upstream
git merge upstream/feature/wilms-tumor-06-azimuth
git switch -c sjspielman/2024-11-18_merge_main
git merge main
git push

@sjspielman sjspielman merged commit 0e055c1 into AlexsLemonade:feature/wilms-tumor-06-azimuth Nov 19, 2024
2 checks passed
@sjspielman sjspielman deleted the sjspielman/2024-11-18_merge_main branch November 19, 2024 13:00
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.

5 participants