Merge release v2.33.0 into master

[serban-nicusor-toptal]

Submission Checklist

• [ ] Run unit tests: ./runTests.py src/test/unit
• [ ] Run cpplint: make cpplint
• [ ] Declare copyright holder and open-source license: see below

Summary

Merge release v2.33.0 into master

Intended Effect

How to Verify

Side Effects

Documentation

Copyright and Licensing

Please list the copyright holder for the work you are submitting (this will be you or your assignee, such as a university or company):

By submitting this pull request, the copyright holder is agreeing to license the submitted work under the following licenses:

• Code: BSD 3-clause (https://opensource.org/licenses/BSD-3-Clause)
• Documentation: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)

[WardBrian]

What are we doing wrong that makes it so there are merge conflicts on these every release?

[serban-nicusor-toptal]

A long time ago, this was done by the following:

git checkout master
git reset --hard v$version
git push origin master

I would assume that messed up the branch history... Even after a rebase we're stuck with a bunch of conflicts. The easy way is to do it like the above, the hard way fix the conflicts and align the history.

[serban-nicusor-toptal]

Closed this and the one in cmdstan as I want to merge release/v2.33.0 into master which is hardcoding the submodules to the release.