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

Merged
merged 3 commits into from
Feb 28, 2025
Merged

Merge v1.x into v2.x #1618

merged 3 commits into from
Feb 28, 2025

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 February 28, 2025 11:14
@GromNaN GromNaN mentioned this pull request Feb 28, 2025
@GromNaN GromNaN requested review from GromNaN and removed request for jmikola February 28, 2025 11:15
@GromNaN GromNaN force-pushed the merge-v1.x-into-v2.x-1740741263182 branch from d216a5b to 1a3e58d Compare February 28, 2025 11:30
@GromNaN
Copy link
Member

GromNaN commented Feb 28, 2025

@alcaeus Not sure what I'm doing. I followed "Ignoring changes" instructions and amended the merge commit with the contents of 6960db0

@GromNaN GromNaN disabled auto-merge February 28, 2025 11:33
* v2.x:
  Add return type hint for Encoder::encode() implementation
  Reverse pipeline init from an array (#1596)
  PHPLIB-1617 Accept a Pipeline instance in aggregate and watch methods (#1580)
  Fix CS
  Require latest python version (#1564) (#1565)
  Update src/Operation/Find.php
  Ignore `disableMD5` option as `md5` field is removed from the spec (#1502)
  Remove obsolete baseline entries
  Regenerate evergreen configuration (#1503)
  PHPLIB-1546 and PHPLIB-1159: Remove CreateCollection flags and autoIndexId options (#1478)
  PHPLIB-1227 Use void return types for operations without meaningful result document (#1468)
  Remove deprecated functionality (#1439)
  PHPLIB-1518 `WriteResult::get*Count()` always return an int on acknowledged result (#1454)
  PHPLIB-954: Add return types to all methods (#1391)
  PHPLIB-797: Remove unused methods in UnsupportedException (#1436)
  Revert "Add final annotations to non-internal Operation classes (#1410)"
  PHPLIB-953 Make internal classes and Operation classes final (#1392)
  PHPLIB-1218 Remove deprecated fields from GridFS files (#1398)
@alcaeus alcaeus force-pushed the merge-v1.x-into-v2.x-1740741263182 branch from 1a3e58d to 09777ea Compare February 28, 2025 12:55
@alcaeus alcaeus removed the request for review from GromNaN February 28, 2025 12:56
@alcaeus alcaeus enabled auto-merge February 28, 2025 12:56
@alcaeus alcaeus merged commit ac468af into v2.x Feb 28, 2025
30 checks passed
@alcaeus alcaeus deleted the merge-v1.x-into-v2.x-1740741263182 branch February 28, 2025 13:13
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