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 #2800

Merged
merged 4 commits into from
Mar 27, 2024
Merged

Merge 4.2 into 4.3 #2800

merged 4 commits into from
Mar 27, 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 March 27, 2024 15:08
@mongodb-php-bot mongodb-php-bot requested a review from jmikola March 27, 2024 15:08
@jmikola jmikola force-pushed the merge-4.2-into-4.3-1711552076532 branch from c6b683e to 90ebf12 Compare March 27, 2024 15:17
@jmikola jmikola merged commit c9b9d2c into 4.3 Mar 27, 2024
46 checks passed
@jmikola jmikola deleted the merge-4.2-into-4.3-1711552076532 branch March 27, 2024 15:22
@GromNaN
Copy link
Member

GromNaN commented Mar 27, 2024

@jmikola It looks like the commits have been rebased before merge into 4.3 😱
image

@jmikola
Copy link
Member

jmikola commented Mar 28, 2024

@GromNaN: I likely did rebase this before merging. I was somewhat distracted with the 1.18 releases, but IIRC the GitHub UI suggested doing so because the PR was out-of-date.

How devastating is this? Is a future auto-merge PR going to want to merge 4.2 again?

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.

3 participants