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

Merging in Changes to Analysis Template Script #66

Merged
merged 8 commits into from
Nov 1, 2024
Merged

Conversation

matthew-w-lundy
Copy link
Collaborator

@samanthalwong script which is used as the validation template has diverged from the main branch. There have also been changes to the underlying functions that may require additional changes to keep everything working together

@matthew-w-lundy
Copy link
Collaborator Author

matthew-w-lundy commented Nov 1, 2024

Ok looks like the only merge conflict has to do with the 3D background check. I'll add a fix and test it to make sure everything is working on Monday.

@matthew-w-lundy matthew-w-lundy merged commit 2d46ac4 into main Nov 1, 2024
@matthew-w-lundy
Copy link
Collaborator Author

Low level branch will not be deleted as there may continue to be other changes for compatibility but having the two standards was leading to large errors and further divergence

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