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.1 into 4.2 #2792

Closed
wants to merge 2 commits into from
Closed

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.1 into 4.2.

Commits

Resolving conflicts

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

Ignoring changes

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

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 March 25, 2024 21:01
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN March 25, 2024 21:01
@GromNaN
Copy link
Member

GromNaN commented Mar 26, 2024

Closing in favor of #2794

@GromNaN GromNaN closed this Mar 26, 2024
@GromNaN GromNaN deleted the merge-4.1-into-4.2-1711400492335 branch April 4, 2024 12:45
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