Skip to content

Conversation

JoshMock
Copy link
Member

No description provided.

@JoshMock JoshMock merged commit 9c95997 into main Aug 19, 2024
@JoshMock JoshMock deleted the auto-merge-authors branch August 19, 2024 15:44
Copy link
Contributor

github-actions bot commented Sep 3, 2024

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

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

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.

1 participant