Skip to content
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

[release/9.0] Treat rtm as stable workload band #940

Merged
merged 1 commit into from
Sep 20, 2024

Conversation

lewing
Copy link
Member

@lewing lewing commented Sep 18, 2024

see discussion at dotnet/sdk#43554

@lewing
Copy link
Member Author

lewing commented Sep 18, 2024

/backport to main

Copy link

Started backporting to main: https://github.com/dotnet/emsdk/actions/runs/10929566508

Copy link

@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!

Copy link

@lewing an error occurred while backporting to main, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@lewing lewing merged commit 8e660ff into dotnet:release/9.0 Sep 20, 2024
13 checks passed
@lewing lewing deleted the rtm-stable-version-band branch September 20, 2024 02:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant