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 #1575

Merged
merged 8 commits into from
Jan 27, 2025
Merged

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.

GromNaN and others added 6 commits January 7, 2025 11:29
Bumps [tests/specifications](https://github.com/mongodb/specifications) from `ce35696` to `60fe09f`.
- [Release notes](https://github.com/mongodb/specifications/releases)
- [Commits](mongodb/specifications@ce35696...60fe09f)

---
updated-dependencies:
- dependency-name: tests/specifications
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
The $geoNear distanceField argument is now optional for queries on non-timeseries collections.
Bumps [tests/specifications](https://github.com/mongodb/specifications) from `60fe09f` to `d9b434d`.
- [Release notes](https://github.com/mongodb/specifications/releases)
- [Commits](mongodb/specifications@60fe09f...d9b434d)

---
updated-dependencies:
- dependency-name: tests/specifications
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner January 27, 2025 07:46
@GromNaN GromNaN force-pushed the merge-v1.x-into-v2.x-1737963978753 branch from 86c432f to cfd8e75 Compare January 27, 2025 13:25
@GromNaN GromNaN mentioned this pull request Jan 27, 2025
@mongodb-php-bot mongodb-php-bot merged commit 79fd723 into v2.x Jan 27, 2025
29 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.x-into-v2.x-1737963978753 branch January 27, 2025 13:44
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