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

Closed
wants to merge 5 commits into from
Closed

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 5 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.
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner January 24, 2025 10:03
@jmikola jmikola mentioned this pull request Jan 24, 2025
@jmikola jmikola requested review from GromNaN and removed request for jmikola January 24, 2025 18:36
@jmikola
Copy link
Member

jmikola commented Jan 24, 2025

@GromNaN: Please take a look at the related test failures. It's not clear to me if these only exist in the merge-up PR, or if they previously existed in the 1.x branch.

@GromNaN
Copy link
Member

GromNaN commented Jan 27, 2025

Superseded by #1575

@GromNaN GromNaN closed this Jan 27, 2025
auto-merge was automatically disabled January 27, 2025 13:27

Pull request was closed

@alcaeus alcaeus deleted the merge-v1.x-into-v2.x-1737713034059 branch February 28, 2025 13:23
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