Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge v1.19 into master #1621

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Merge v1.19 into master #1621

merged 1 commit into from
Aug 28, 2024

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
PHPC-2420: Compare Int64 instances without casting (#1617)
f47915e 
* PHPC-2420: Compare Int64 instances without casting

* Fix comparison logic on PHP 7.4

* Handle Int64 comparisons with other zvals in PHP 7.4
@mongodb-php-bot mongodb-php-bot merged commit 9bd1244 into master Aug 28, 2024
100 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.19-into-master-1724847357469 branch August 28, 2024 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alcaeus alcaeus alcaeus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mongodb-php-bot @alcaeus