Merge main into develop #394
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Cray * Icx (LLVM Intel) * nVidia
|
It should have been a simple merge from main into develop, but git got thoroughly confused and created heaps of duplicated code, trying to resolve imagined conflicts :( |
jasonjunweilyu
requested changes
Mar 5, 2025
There was a problem hiding this comment.
Hi @hiker , one minor typo I think and then this is good to be merged.
jasonjunweilyu
approved these changes
Mar 6, 2025
There was a problem hiding this comment.
Hi @hiker, thanks for fixing the typo. I think this is now ready to be merged into develop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trying a separate PR to merge main into develop to solve git confusion :(