Skip to content

Merge v1.x into v2.x #1715

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

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.x into v2.x.

Commits

Resolving conflicts

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

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:
git reset --hard v2.x
git merge --strategy=ours v1.x

Then, push the temporary branch to upate the pull request.

@alcaeus alcaeus requested a review from jmikola October 9, 2024 15:29
@mongodb-php-bot mongodb-php-bot merged commit ca01041 into v2.x Oct 9, 2024
57 of 59 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.x-into-v2.x-1728487624537 branch October 9, 2024 15:58
@jmikola
Copy link
Member

jmikola commented Oct 9, 2024

@alcaeus: I have no idea why this was automatically merged. The merge commit (ca01041) shows a few tasks still in progress:

image

And even the PR comment above states: "57 of 59 checks passed" with at least one failure:

In any event, I'm not worried about these CI failures as the merge itself is correct. But this may highlight another oddity of these automated merge-up PRs.

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