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

Epic: Backports for v1.13.0-rc2 #1149

Closed
7 of 11 tasks
SpicyLemon opened this issue Oct 13, 2022 · 0 comments
Closed
7 of 11 tasks

Epic: Backports for v1.13.0-rc2 #1149

SpicyLemon opened this issue Oct 13, 2022 · 0 comments

Comments

@SpicyLemon
Copy link
Contributor

SpicyLemon commented Oct 13, 2022

Summary

We're going to need a v1.13.0-rc2.

Here are some PRs that should be backported to it. Some of these should be done as their own PR while others can be combined.

The PRs listed above are the original PRs to main.

To backport them to release/v1.13.x:

  1. git checkout main && git pull
  2. Use git log --oneline to identify the commit hash of the PR(s) desired.
  3. git checkout release/v1.13.x && git pull
  4. git checkout -b <user>/bp-<something>
  5. Use git cherry-pick <commit hash> to apply a PR to your branch.
  6. If there are any conflicts, fix them and commit.
  7. Repeat 5 and 6 for each PR in the group.
  8. Create a new PR from your branch with release/v1.13.x as the target branch.
  9. A merge commit would better help git track similarities between main and release/v1.13.x. A squash and merge just makes the merge back to main a little messier.

For Admin Use

  • Not duplicate issue
  • Appropriate labels applied
  • Appropriate contributors tagged
  • Contributor assigned/self-assigned
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

No branches or pull requests

1 participant