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

[Backport 2.5] Propagate UI changes to 2.6 #6057

Merged
merged 1 commit into from
Jan 8, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 5e28aa8 from #6056.

Signed-off-by: Fanit Kolchina <[email protected]>
(cherry picked from commit 5e28aa8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@kolchfa-aws kolchfa-aws merged commit b7dd3ac into 2.5 Jan 8, 2024
2 checks passed
@github-actions github-actions bot deleted the backport/backport-6056-to-2.5 branch January 8, 2024 16:49
@kolchfa-aws kolchfa-aws added the backport 2.4 PR: Backport label for 2.4 label Jan 8, 2024
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.4 PR: Backport label for 2.4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant