Auto GitFlow - main → develop #3083
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
GitFlow: Merge develop into main for 2.49 release
# Conflicts: # CHANGELOG.md # CMakeLists.txt
GitFlow: Merge 2.46.4 hotfix into main
mathomp4
approved these changes
Oct 7, 2024
mathomp4
added
the
0 Diff
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.
📝 Automatic PR: Gitflow:
main→developDescription
candidate for v2.46.4 remove assert that there is no mask
📁 Modified files
CHANGELOG.md | 6 ++++++
CMakeLists.txt | 2 +-
base/MAPL_EsmfRegridder.F90 | 10 ++++++----
3 files changed, 13 insertions(+), 5 deletions(-)