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

Pull main into dev #883

Merged
merged 13 commits into from
Dec 18, 2024
Merged

Pull main into dev #883

merged 13 commits into from
Dec 18, 2024

Conversation

melissa-barca
Copy link
Contributor

My understanding of the workflow was that we pull dev into main, but it looks like this needs to happen to resolve the conflict in #882

@ianpittwood ianpittwood merged commit 6256435 into dev Dec 18, 2024
42 checks passed
@ianpittwood ianpittwood deleted the main-into-dev branch December 18, 2024 14:37
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.

4 participants