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.

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

Merge v1.x into v2.x #1548

Merged
4 commits merged into from
Dec 4, 2024
Merged

Merge v1.x into v2.x #1548

4 commits merged into from
Dec 4, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.x into v2.x.

Commits

Resolving conflicts

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

Ignoring changes

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

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

@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner December 3, 2024 17:04
src/Builder/Encoder/OperatorEncoder.php Dismissed Show dismissed Hide dismissed
src/Builder/Encoder/OperatorEncoder.php Dismissed Show dismissed Hide dismissed
src/Builder/Encoder/OperatorEncoder.php Dismissed Show dismissed Hide dismissed
src/Builder/Encoder/OperatorEncoder.php Dismissed Show dismissed Hide dismissed
src/Builder/Type/CombinedFieldQuery.php Dismissed Show dismissed Hide dismissed
src/Builder/Type/QueryObject.php Dismissed Show dismissed Hide dismissed
src/Builder/Type/QueryObject.php Dismissed Show dismissed Hide dismissed
src/Builder/Type/QueryObject.php Dismissed Show dismissed Hide dismissed
src/Builder/Type/QueryObject.php Dismissed Show dismissed Hide dismissed
src/Builder/Type/QueryObject.php Dismissed Show dismissed Hide dismissed
@jmikola
Copy link
Member

jmikola commented Dec 3, 2024

This will likely depend on #1547 to pass CI.

@mongodb-php-bot mongodb-php-bot closed this pull request by merging all changes into v2.x in 99b1889 Dec 4, 2024
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.x-into-v2.x-1733245464805 branch December 4, 2024 10:25
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.

3 participants