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 v2.7-branch] backport of #38834 failed #39022

Closed
zephyrbot opened this issue Oct 1, 2021 · 1 comment
Closed

[backport v2.7-branch] backport of #38834 failed #39022

zephyrbot opened this issue Oct 1, 2021 · 1 comment
Assignees
Labels
Backport Backport PR and backport failure issues

Comments

@zephyrbot
Copy link
Collaborator

This issue was created automatically because the backport of #38834 to v2.7-branch failed.

The backport to v2.7-branch 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-v2.7-branch v2.7-branch
# Navigate to the new working tree
cd .worktrees/backport-v2.7-branch
# Create a new branch
git switch --create backport-38834-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick a627666e0627b6897c8d89be2e8b4eefea4071f7~5..a627666e0627b6897c8d89be2e8b4eefea4071f7
# Push it to GitHub
git push --set-upstream origin backport-38834-to-v2.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v2.7-branch

Then, create a pull request where the base branch is v2.7-branch and the compare/head branch is backport-38834-to-v2.7-branch.

@zephyrbot zephyrbot added the Backport Backport PR and backport failure issues label Oct 1, 2021
@cfriedt
Copy link
Member

cfriedt commented Oct 12, 2021

made it in

@cfriedt cfriedt closed this as completed Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Backport PR and backport failure issues
Projects
None yet
Development

No branches or pull requests

3 participants