Skip to content

Merge 4.3 into 4.4 #2963

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
May 21, 2024
Merged

Merge 4.3 into 4.4 #2963

merged 2 commits into from
May 21, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.3 into 4.4.

Commits

Resolving conflicts

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

Ignoring changes

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

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 May 21, 2024 20:52
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN May 21, 2024 20:52
@mongodb-php-bot mongodb-php-bot enabled auto-merge May 21, 2024 20:52
@mongodb-php-bot mongodb-php-bot merged commit cb84a43 into 4.4 May 21, 2024
48 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-4.3-into-4.4-1716324718461 branch May 21, 2024 20:54
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants