-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Maintenance package version updates. #7304
Conversation
Merging on red since the only test failures are known test failures and we don't have the repo set up correctly for Build Analysis to be able to bypass it. |
/backport to release/4.0 |
Started backporting to release/4.0: https://github.com/dotnet/machinelearning/actions/runs/11808307602 |
@michaelgsharp backporting to release/4.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: mp updates
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 mp updates
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@michaelgsharp an error occurred while backporting to release/4.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #7304 +/- ##
==========================================
- Coverage 68.88% 68.87% -0.01%
==========================================
Files 1470 1470
Lines 274005 274005
Branches 28403 28403
==========================================
- Hits 188747 188723 -24
- Misses 77942 77961 +19
- Partials 7316 7321 +5
Flags with carried forward coverage won't be shown. Click here to find out more. |
Updates to new stable maintenance package versions.