Skip to content

Conversation

@delvedor
Copy link
Member

As titled.

@delvedor delvedor requested a review from picandocodigo May 19, 2022 13:21
Copy link
Member

@picandocodigo picandocodigo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@delvedor delvedor merged commit 697b594 into main May 19, 2022
@delvedor delvedor deleted the makesh branch May 19, 2022 16:23
@github-actions
Copy link
Contributor

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

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

delvedor added a commit that referenced this pull request May 20, 2022
@delvedor delvedor mentioned this pull request May 24, 2022
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