Skip to content

Conversation

@seisman
Copy link
Member

@seisman seisman commented Sep 1, 2020

No description provided.

@seisman seisman requested a review from PaulWessel September 1, 2020 19:48
@seisman seisman added the backport 6.1 Backport this PR to 6.1 branch label Sep 1, 2020
Copy link
Member

@PaulWessel PaulWessel left a comment

Choose a reason for hiding this comment

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

Great

@seisman seisman mentioned this pull request Sep 1, 2020
45 tasks
@seisman seisman merged commit 9f038fc into master Sep 1, 2020
@seisman seisman deleted the fix-docs-h branch September 1, 2020 19:50
@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2020

The backport to 6.1 failed:

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 6.1 Backport this PR to 6.1 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants