Skip to content

Conversation

JoshMock
Copy link
Member

No description provided.

@JoshMock JoshMock merged commit 37b8a33 into main Aug 12, 2024
4 of 5 checks passed
@JoshMock JoshMock deleted the auto-approve-fix branch August 12, 2024 17:01
Copy link
Contributor

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

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

github-actions bot pushed a commit that referenced this pull request Aug 12, 2024
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