emsdk (original) (raw)

@lewing backporting to main failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Treat rtm as stable workload band Using index info to reconstruct a base tree... M eng/Versions.props M eng/nuget/Microsoft.NET.Runtime.Emscripten.Common.props Falling back to patching base and 3-way merge... Auto-merging eng/nuget/Microsoft.NET.Runtime.Emscripten.Common.props CONFLICT (content): Merge conflict in eng/nuget/Microsoft.NET.Runtime.Emscripten.Common.props Auto-merging 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 Treat rtm as stable workload band Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!