merge main into dmUpdate

rem1776 commented 4 months ago

Description update with main for the tag

How Has This Been Tested? CI

Checklist:

[x] My code follows the style guidelines of this project
[x] I have performed a self-review of my own code
[x] I have commented my code, particularly in hard-to-understand areas
[x] I have made corresponding changes to the documentation
[x] My changes generate no new warnings
[x] Any dependent changes have been merged and published in downstream modules
[x] New check tests, if applicable, are included
[x] make distcheck passes

thomas-robinson commented 4 months ago

This should be a merge and commit, not a squash. We don't have to get rid of all the history on main.

rem1776 commented 4 months ago

This should be a merge and commit, not a squash. We don't have to get rid of all the history on main.

I think merges are disabled for the repository, it only gives the option for rebasing and squashing. can you change that from your settings?

I think I'll need to rebase or do some cherry picking with the branch regardless, I've spent some time trying to get it cleaned up due to duplicates from earlier in the history.

NOAA-GFDL / FMS

merge main into dmUpdate #1476