[release/7.0] Update to RTM build#11547
Merged
mmitche merged 2 commits intorelease/7.0from Nov 8, 2022
Merged
Conversation
MattGal
approved these changes
Nov 8, 2022
MattGal
approved these changes
Nov 8, 2022
Member
Author
|
/backport to main |
Contributor
|
Started backporting to main: https://github.com/dotnet/arcade/actions/runs/3472388153 |
Contributor
|
@mmitche backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update to RTM build
Using index info to reconstruct a base tree...
M global.json
Falling back to patching base and 3-way merge...
Auto-merging global.json
CONFLICT (content): Merge conflict in global.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 Update to RTM build
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! |
Contributor
|
@mmitche 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. |
mmitche
added a commit
to mmitche/arcade
that referenced
this pull request
Nov 15, 2022
* Update to RTM build * Update aspnet runtime version
mmitche
added a commit
that referenced
this pull request
Nov 15, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
To double check: