Skip to content

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.

norareidy and others added 3 commits May 6, 2024 10:49
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner May 6, 2024 14:58
@mongodb-php-bot mongodb-php-bot enabled auto-merge May 6, 2024 14:58
@mongodb-php-bot mongodb-php-bot merged commit e743d1e into 4.4 May 6, 2024
@mongodb-php-bot mongodb-php-bot deleted the merge-4.3-into-4.4-1715007514348 branch May 6, 2024 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants