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

Resolve conflicts w/ main #6936

Conversation

djaglowski
Copy link
Member

@djaglowski djaglowski commented Jan 12, 2023

This PR cherry picks #6822 and resolves conflicts by accepting changes from v0.69.x branch. The net result is no change to code, but possibly this is what git needs in order to resolve problems with #6934.

@codecov
Copy link

codecov bot commented Jan 12, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release/v0.69.x@b6571e0). Click here to learn what that means.
Patch has no changes to coverable lines.

Additional details and impacted files
@@                Coverage Diff                 @@
##             release/v0.69.x    #6936   +/-   ##
==================================================
  Coverage                   ?   91.05%           
==================================================
  Files                      ?      237           
  Lines                      ?    14298           
  Branches                   ?        0           
==================================================
  Hits                       ?    13019           
  Misses                     ?     1027           
  Partials                   ?      252           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@djaglowski djaglowski marked this pull request as ready for review January 12, 2023 16:59
@djaglowski
Copy link
Member Author

Closing in favor of an approach that does not modify history on the release branch.

@djaglowski djaglowski closed this Jan 12, 2023
@djaglowski djaglowski deleted the release/v0.69.x-cherry-pick-main branch January 12, 2023 17:15
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