Conversation
|
Need to get the package mirrored to our feed, doing that now |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/backport to release/9.0 |
|
Started backporting to release/9/0: https://github.com/dotnet/aspnetcore/actions/runs/11448932358 |
|
Started backporting to release/9.0: https://github.com/dotnet/aspnetcore/actions/runs/11448933851 |
|
/backport to release/8.0 |
|
@wtgodbe an error occurred while backporting to release/9/0, please check the run log for details! Error: The specified backport target branch release/9/0 wasn't found in the repo. |
|
Started backporting to release/8.0: https://github.com/dotnet/aspnetcore/actions/runs/11448939638 |
|
@wtgodbe backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update Messagepack dependency
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 Update Messagepack dependency
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@wtgodbe an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
* Update Messagepack dependency * Update submodule
Fixes #58532