Skip to content
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

Merge 4.2 into 4.3 #3018

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Merge 4.2 into 4.3 #3018

merged 2 commits into from
Jun 28, 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 June 28, 2024 16:55
@github-actions github-actions bot added the docs label Jun 28, 2024
@mongodb-php-bot mongodb-php-bot merged commit f6bb2ff into 4.3 Jun 28, 2024
75 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-4.2-into-4.3-1719593730256 branch June 28, 2024 16:59
This was referenced Jun 28, 2024
This was referenced Jul 8, 2024
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