-
Notifications
You must be signed in to change notification settings - Fork 6
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
fix: cherry pick conflicts #2214
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #2214 +/- ##
=============================================
- Coverage 58.02% 58.01% -0.01%
Complexity 21 21
=============================================
Files 1070 1070
Lines 40701 40701
Branches 3766 3766
=============================================
- Hits 23615 23612 -3
- Misses 15468 15470 +2
- Partials 1618 1619 +1 see 2 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
Datadog ReportBranch report: ✅ |
Cherry pick from the original PR:
PR Submission Checklist for internal contributors
The PR Title
The PR Description
What's new in this PR?
Issues
When there was more than one merge conflict automatic cherry pick failed
Solutions
, which echo -e in bash can interpret as a newline
with
, to don't end up with an extra newline at the end.