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 main] Simplify ML processor form when interface is defined #677

Merged
merged 1 commit into from
Mar 13, 2025

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 47d59fe from #676.

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
(cherry picked from commit 47d59fe)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@saimedhi saimedhi merged commit 1ca0400 into main Mar 13, 2025
15 of 16 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-677-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1ca0400b8f0be454dc2fd46747cb2332ca82d6b0
# Push it to GitHub
git push --set-upstream origin backport/backport-677-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-flow-framework/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-677-to-2.x.

@ohltyler ohltyler deleted the backport/backport-676-to-main branch March 13, 2025 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autocut enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants