Skip to content

Merge v1.x into v2.0 #1667

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

Closed
wants to merge 2 commits into from
Closed

Conversation

mongodb-php-bot
Copy link
Collaborator

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

Commits

Resolving conflicts

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

Ignoring changes

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

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 April 10, 2025 12:11
@mongodb-php-bot mongodb-php-bot requested a review from jmikola April 10, 2025 12:11
Copy link

There is an existing patch(es) for this commit SHA:

Please note that the status that is posted is not in the context of this PR but rather the (latest) existing patch and that may affect some tests that may depend on the particular PR. If your tests do not rely on any PR-specific values (like base or head branch name) then your tests will report the same status. If you would like a patch to run in the context of this PR and abort the other(s), comment 'evergreen retry'.

@alcaeus
Copy link
Member

alcaeus commented Apr 10, 2025

Duplicate of #1666 as auto-merge can't be enabled when changing workflow files.

@alcaeus alcaeus closed this Apr 10, 2025
@alcaeus alcaeus deleted the merge-v1.x-into-v2.0-1744287109672 branch April 10, 2025 12:15
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