-
Notifications
You must be signed in to change notification settings - Fork 507
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
Initial changes add backport automerge label #6865
Merged
peterzhuamazon
merged 3 commits into
opensearch-project:main
from
peterzhuamazon:initial-changes-add-backport-automerge-label
Apr 3, 2024
Merged
Initial changes add backport automerge label #6865
peterzhuamazon
merged 3 commits into
opensearch-project:main
from
peterzhuamazon:initial-changes-add-backport-automerge-label
Apr 3, 2024
+11
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
peterzhuamazon
requested review from
hdhalter,
kolchfa-aws,
Naarcha-AWS,
vagimeli,
AMoo-Miki,
natebower,
dlvenable,
stephen-crawford and
epugh
as code owners
April 2, 2024 23:27
Signed-off-by: Peter Zhu <[email protected]>
peterzhuamazon
force-pushed
the
initial-changes-add-backport-automerge-label
branch
from
April 2, 2024 23:34
3bb39c3
to
a799e88
Compare
Signed-off-by: Peter Zhu <[email protected]>
…-backport-automerge-label
kolchfa-aws
approved these changes
Apr 3, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thank you, @peterzhuamazon!
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-testmain testmain
# Navigate to the new working tree
pushd ../.worktrees/backport-testmain
# Create a new branch
git switch --create backport/backport-6865-to-testmain
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 afa4d2754a23cba4d7d92c6c5bc669561966977d
# Push it to GitHub
git push --set-upstream origin backport/backport-6865-to-testmain
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-testmain Then, create a pull request where the |
peterzhuamazon
added
backport 2.13
PR: Backport label for 2.13
and removed
backport testmain
labels
Apr 3, 2024
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Apr 3, 2024
* Add a label to backport PRs in preparation for backport automerge Signed-off-by: Peter Zhu <[email protected]> * Small tweaks Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]> (cherry picked from commit afa4d27) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
peterzhuamazon
pushed a commit
that referenced
this pull request
Apr 3, 2024
* Add a label to backport PRs in preparation for backport automerge * Small tweaks --------- (cherry picked from commit afa4d27) Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Initial changes add backport automerge label
Issues Resolved
#6400
Checklist
For more information on following Developer Certificate of Origin and signing off your commits, please check here.