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

Bump fluentd from 1.12.0-sumo-0-rc.0 to 1.12.0-sumo-1-rc.0 #1400

Merged
merged 1 commit into from
Feb 5, 2021

Conversation

andrzej-stencel
Copy link
Contributor

@andrzej-stencel andrzej-stencel commented Feb 5, 2021

@andrzej-stencel andrzej-stencel merged commit 17f9fda into main Feb 5, 2021
@andrzej-stencel andrzej-stencel deleted the bump-fluentd-to-1.12.0-sumo-1-rc.0 branch February 5, 2021 13:33
@github-actions
Copy link

github-actions bot commented Feb 5, 2021

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants