Skip to content

Merge v1.19 into master #1311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 21, 2024
Merged

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.19 into master.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge master

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy:
git reset --hard master
git merge --strategy=ours v1.19

Then, push the temporary branch to upate the pull request.

alcaeus and others added 3 commits May 21, 2024 09:57
* PHPLIB-1435: Integrate static analysis for releases

* Extract setup action and split static analysis job

* Use correct capitalisation for acronym

* Upgrade to latest rector version
* v1.19:
  DOCSP-37027: Fix build errors (#1289)
  PHPLIB-1415 Add tests for PHP 8.4 (#1287)
  PHPLIB-1163 Create tutorial for using MongoDB with Bref (#1273)
  Relax branch-alias on dev-master to avoid update on each release (#1277)
  PHPLIB-1424: Fix potentially racy w:0 unified tests (#1276)
  Leverage PHP 8.0 string functions (#1274)
  Master is now 1.19-dev
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner May 21, 2024 09:30
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN May 21, 2024 09:30
@mongodb-php-bot mongodb-php-bot enabled auto-merge May 21, 2024 09:30
@mongodb-php-bot mongodb-php-bot merged commit afcb801 into master May 21, 2024
41 of 42 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.19-into-master-1716283818463 branch May 21, 2024 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants