Skip to content

Conversation

@JoshMock
Copy link
Member

@JoshMock JoshMock commented Apr 7, 2025

No description provided.

@l-trotta l-trotta merged commit 276bc92 into main Apr 8, 2025
8 checks passed
@l-trotta l-trotta deleted the eis-cleanup branch April 8, 2025 09:20
github-actions bot pushed a commit that referenced this pull request Apr 8, 2025
Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
(cherry picked from commit 276bc92)
github-actions bot pushed a commit that referenced this pull request Apr 8, 2025
Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
(cherry picked from commit 276bc92)
@github-actions
Copy link
Contributor

github-actions bot commented Apr 8, 2025

The backport to 9.0 failed:

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

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

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

l-trotta pushed a commit that referenced this pull request Apr 8, 2025
Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
(cherry picked from commit 276bc92)

Co-authored-by: Josh Mock <joshua.mock@elastic.co>
l-trotta pushed a commit that referenced this pull request Apr 8, 2025
Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
(cherry picked from commit 276bc92)

Co-authored-by: Josh Mock <joshua.mock@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants