add RID for Alpine 3.18 #86276
add RID for Alpine 3.18 #86276
Conversation
ghost
added
the
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue Detailsnull
|
|
/backport to release/7.0-staging |
|
/backport to release/6.0-staging |
|
/backport to release/7.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/4984960935 |
|
/backport to release/6.0-staging |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/4984996637 |
|
@wfurt backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: add RID for Alpine 3.18
Using index info to reconstruct a base tree...
M src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
M src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
M src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
CONFLICT (content): Merge conflict in src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
Auto-merging src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
Auto-merging src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add RID for Alpine 3.18
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@wfurt an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
2 participants
No description provided.