Update to Fedora 41 by BrennanConroy · Pull Request #59814 · dotnet/aspnetcore (original) (raw)
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 andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation6 Commits1 Checks28 Files changed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
[ Show hidden characters]({{ revealButtonHref }})
Supposedly Fedora 40 images never existed for helix...
@BrennanConroy 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 to Fedora 41 Using index info to reconstruct a base tree... M eng/targets/Helix.Common.props Falling back to patching base and 3-way merge... Auto-merging eng/targets/Helix.Common.props CONFLICT (content): Merge conflict in eng/targets/Helix.Common.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 to Fedora 41 Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
Labels
Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
2 participants
