Merge main into develop in prep for future release

[gmao-rreichle]

No description provided.

[gmao-rreichle]

@mathomp4 : I'm trying to merge main back into develop to sync the commit history. Everything seems to be fine except GitHub requires an entry in CHANGELOG. In this case, it doesn't really make sense to edit CHANGELOG.
I suppose I could add a blank space to CHANGELOG, but maybe there's a better way to force the issue? Please advise, thanks!

[gmao-rreichle]

@mathomp4 : I'm trying to merge main back into develop to sync the commit history. Everything seems to be fine except GitHub requires an entry in CHANGELOG. In this case, it doesn't really make sense to edit CHANGELOG. I suppose I could add a blank space to CHANGELOG, but maybe there's a better way to force the issue? Please advise, thanks!

@mathomp4 : Never mind, I figured out that adding a "Skip Changelog" label let's me move ahead.

[mathomp4]

@mathomp4 : I'm trying to merge main back into develop to sync the commit history. Everything seems to be fine except GitHub requires an entry in CHANGELOG. In this case, it doesn't really make sense to edit CHANGELOG. I suppose I could add a blank space to CHANGELOG, but maybe there's a better way to force the issue? Please advise, thanks!

@mathomp4 : Never mind, I figured out that adding a "Skip Changelog" label let's me move ahead.

Ah yeah. I think the "0-diff trivial" will also skip the Changelog enforcer (for example no need for a changelog entry if you fix a typo or the like)