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

GODRIVER-3314 Fix backport script invocation #1781

Merged
merged 2 commits into from
Aug 30, 2024

Conversation

blink1073
Copy link
Member

GODRIVER-3314

Summary

Fix cherry-pick script invocation.

@blink1073
Copy link
Member Author

drivers-pr-bot please backport to master

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot added the priority-3-low Low Priority PR for Review label Aug 29, 2024
Copy link
Contributor

API Change Report

No changes found!

@blink1073 blink1073 merged commit 6fb6d07 into mongodb:v1 Aug 30, 2024
29 of 33 checks passed
@blink1073 blink1073 deleted the GODRIVER-3314-fix-args branch August 30, 2024 16:53
@mongodb mongodb deleted a comment from mongodb-drivers-pr-bot bot Aug 30, 2024
@mongodb mongodb deleted a comment from mongodb-drivers-pr-bot bot Aug 30, 2024
Copy link
Contributor

Sorry, unable to cherry-pick to master, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout -b cherry-pick-master-6fb6d07d245046ed3906a285e74c124e89b401d1 master

git fetch origin 6fb6d07d245046ed3906a285e74c124e89b401d1
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 6fb6d07d245046ed3906a285e74c124e89b401d1
  1. You will likely have some merge/cherry-pick conflicts here, fix them and commit:
git commit -am {message}
  1. Push to a named branch:
git push origin cherry-pick-master-6fb6d07d245046ed3906a285e74c124e89b401d1
  1. Create a PR against branch master. I would have named this PR:

"GODRIVER-3314 Fix backport script invocation (#1781) [master]"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority-3-low Low Priority PR for Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants