Skip to content

Merge 4.9 into 5.0 #3352

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

Closed
wants to merge 1 commit into from
Closed

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.9 into 5.0.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 5.0

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to 5.0 and manually merge using the `ours` merge strategy:
git reset --hard 5.0
git merge --strategy=ours 4.9

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 April 14, 2025 12:42
@mongodb-php-bot mongodb-php-bot requested a review from jmikola April 14, 2025 12:42
@GromNaN GromNaN changed the base branch from 5.0 to 5.x April 14, 2025 12:43
@alcaeus alcaeus requested review from GromNaN and removed request for jmikola April 14, 2025 12:43
@GromNaN GromNaN changed the base branch from 5.x to 5.3 April 14, 2025 12:43
@GromNaN GromNaN changed the base branch from 5.3 to 5.0 April 14, 2025 12:44
@GromNaN
Copy link
Member

GromNaN commented Apr 14, 2025

Closing as this change has already been applied on branch 5.2

@GromNaN GromNaN closed this Apr 14, 2025
auto-merge was automatically disabled April 14, 2025 12:45

Pull request was closed

@GromNaN GromNaN deleted the merge-4.9-into-5.0-1744634553015 branch April 14, 2025 12:45
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.

2 participants