Skip to content

Merge 4.4 into 4.5 #3007

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 1 commit into from
Jun 17, 2024
Merged

Merge 4.4 into 4.5 #3007

merged 1 commit into from
Jun 17, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.4 into 4.5.

Commits

Resolving conflicts

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

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to 4.5 and manually merge using the `ours` merge strategy:
git reset --hard 4.5
git merge --strategy=ours 4.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 June 17, 2024 08:57
@mongodb-php-bot mongodb-php-bot requested a review from jmikola June 17, 2024 08:57
@alcaeus alcaeus removed the request for review from jmikola June 17, 2024 08:58
@mongodb-php-bot mongodb-php-bot merged commit e79b0ae into 4.5 Jun 17, 2024
75 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-4.4-into-4.5-1718614633635 branch June 17, 2024 08:58
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