Closed michaelgsharp closed 1 week ago
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.
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 68.87%. Comparing base (
4a6ce50
) to head (2b11fb2
). Report is 2 commits behind head on main.
Updates to new stable maintenance package versions.