Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented Apr 11, 2024

Merge new changes from v1.18 into master.

Commits

  • Prepare 1.18.1 release (Prepare 1.18.1 release #1534): b795048
  • Back to -dev: 6a49ef7
  • Package 1.18.1: 451fec4
  • 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.18
    

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

@alcaeus
Copy link
Member

alcaeus commented Apr 11, 2024

Note: I'll rebase this PR after #1533 is merged.

@alcaeus
Copy link
Member

alcaeus commented Apr 11, 2024

Manually merged using the ours strategy as the changes in phongo_version don't need to be included.

@alcaeus alcaeus force-pushed the merge-v1.18-into-master-1712848516874 branch from 40416ec to 96c2413 Compare April 11, 2024 15:35
@alcaeus alcaeus enabled auto-merge April 11, 2024 15:37
@alcaeus alcaeus merged commit c759ab1 into master Apr 11, 2024
@alcaeus alcaeus deleted the merge-v1.18-into-master-1712848516874 branch April 11, 2024 15:55
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