Skip to content

Merge 5.4 into 5.x #3427

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

Merged
merged 2 commits into from
Jul 10, 2025
Merged

Merge 5.4 into 5.x #3427

merged 2 commits into from
Jul 10, 2025

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 5.4 into 5.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 5.x -m "Resolve conflicts in 5.x"

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to 5.x and manually merge using the `ours` merge strategy:
git reset --hard 5.x
git merge --strategy=ours 5.4 -m "Ignore changes from 5.4"

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 July 10, 2025 13:57
@github-actions github-actions bot added the docs label Jul 10, 2025
@norareidy norareidy closed this Jul 10, 2025
auto-merge was automatically disabled July 10, 2025 14:02

Pull request was closed

@alcaeus alcaeus reopened this Jul 10, 2025
@alcaeus alcaeus enabled auto-merge July 10, 2025 14:08
@alcaeus alcaeus merged commit fafc6f4 into 5.x Jul 10, 2025
280 checks passed
@alcaeus alcaeus deleted the merge-5.4-into-5.x-1752155825579 branch July 10, 2025 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants