Skip to content

Test bp pr 1#11

Merged
AMoo-Miki merged 1 commit intotest-bpfrom
test-bp-pr-1
Jun 3, 2023
Merged

Test bp pr 1#11
AMoo-Miki merged 1 commit intotest-bpfrom
test-bp-pr-1

Conversation

@AMoo-Miki
Copy link
Copy Markdown
Owner

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
    • yarn test:ftr
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Signed-off-by: Miki <miki@amazon.com>
@AMoo-Miki AMoo-Miki added bug Something isn't working documentation Improvements or additions to documentation backport 9.x labels Jun 3, 2023
@AMoo-Miki AMoo-Miki merged commit 1ca32e6 into test-bp Jun 3, 2023
@github-actions
Copy link
Copy Markdown

github-actions bot commented Jun 3, 2023

The backport to 9.x failed:

The process '/usr/bin/git' failed with exit code 128

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

Then, create a pull request where the base branch is 9.x and the compare/head branch is backport/backport-11-to-9.x.

@github-actions github-actions bot added failed backport and removed bug Something isn't working documentation Improvements or additions to documentation backport 9.x valued-contributor labels Jun 3, 2023
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