Merge release v2.33.0 into master

stan-dev / stan

Stan development repository. The master branch contains the current release. The develop branch contains the latest stable development. See the Developer Process Wiki for details.

https://mc-stan.org

BSD 3-Clause "New" or "Revised" License

2.56k stars 366 forks source link

Merge release v2.33.0 into master #3226

Closed serban-nicusor-toptal closed 10 months ago

serban-nicusor-toptal commented 10 months ago

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/)

SteveBronder commented 10 months ago

Sorry, can merge once conflicts are resolved.

WardBrian commented 10 months ago

@serban-nicusor-toptal I would check that this had the expected result locally but I think what we want to do here is git merge master -X ours to unconditionally accept the state of release/v2.33.0 over that of master

serban-nicusor-toptal commented 10 months ago

I'm not sure what's up with this PR, I've fixed the conflicts locally and committed. Also for the above command I get Already up to date.

WardBrian commented 10 months ago

I think github is having a hiccup right now - I noticed something similar on a cmdstanpy pull request

serban-nicusor-toptal commented 10 months ago

I can't even close PRs, let's give it a few minutes.

WardBrian commented 10 months ago

Well would you look at that: https://www.githubstatus.com/