Main to GFDL (2025-01-28)#1026
Conversation
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/mom6ci/MOM6/-/pipelines/29943 ✔️ This is ready to merge after review and approval. |
Hallberg-NOAA
left a comment
Hallberg-NOAA
left a comment
There was a problem hiding this comment.
These added changes seem innocuous to me.
|
The contents of this PR have been merged into dev/gfdl (via a merge commit), so this PR can now be closed. |
|
It should have closed on its own. I think I made a mistake in the merge. Reopening this until its sorted out. |
|
I see all of the commits. I don't know why this didn't auto-close. I guess we just move on. |
|
Ok, it just has a different "merge" commit from the actual merge commit. Normally I test the same branch that I merge, but in this case I repeated the merge on a new branch. Identical code, nearly identical history, but different hashes (due to timestamps, etc). So nothing unusual here. In the future, if we want these PRs to auto-close, we should use the same PR for testing and merging. |
2 participants
Merging the recent updates to
mainintodev/gfdl.This includes mom-ocean#1675 and fixes from mom-ocean#1680.
This PR should be merged outside of GitHub (e.g. command-line). Do not use GitHub merging.