Skip to content

Merge 4.2 into 4.3 #2911

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 1 commit into from
Apr 25, 2024
Merged

Merge 4.2 into 4.3 #2911

merged 1 commit into from
Apr 25, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.2 into 4.3.

Commits

Resolving conflicts

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

Ignoring changes

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

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 25, 2024 10:33
@mongodb-php-bot mongodb-php-bot requested a review from jmikola April 25, 2024 10:33
@mongodb-php-bot mongodb-php-bot merged commit a72d181 into 4.3 Apr 25, 2024
73 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-4.2-into-4.3-1714041203931 branch April 25, 2024 10:35
# 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