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

Tweak syntax for the merged branch deletion workflow #6814

Merged
merged 1 commit into from
Mar 29, 2024

Conversation

peterzhuamazon
Copy link
Member

Description

Tweak syntax for the merged branch deletion workflow

Issues Resolved

#6400

Checklist

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
    For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon added enhancement New feature or request wontfix We will not address this issue due to complexity or invalidity. labels Mar 29, 2024
@peterzhuamazon peterzhuamazon self-assigned this Mar 29, 2024
@peterzhuamazon peterzhuamazon merged commit 0c90ded into main Mar 29, 2024
6 checks passed
@github-actions github-actions bot deleted the tweak-merged-branch-removal branch March 29, 2024 22:04
@peterzhuamazon peterzhuamazon added the backport 2.12 PR: Backport label for 2.12 label Mar 29, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

The process '/usr/bin/git' failed with exit code 128

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-2.12 2.12
# Navigate to the new working tree
pushd ../.worktrees/backport-2.12
# Create a new branch
git switch --create backport/backport-6814-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0c90ded7e4506fd51eb48d004d15bebb5f5fd426
# Push it to GitHub
git push --set-upstream origin backport/backport-6814-to-2.12
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-6814-to-2.12.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request wontfix We will not address this issue due to complexity or invalidity.
Projects
Development

Successfully merging this pull request may close these issues.

2 participants