[wasm][debugger] Using "RollForward": major for BrowserDebugHost#89960
[wasm][debugger] Using "RollForward": major for BrowserDebugHost#89960thaystg merged 1 commit intodotnet:mainfrom
Conversation
|
Tagging subscribers to this area: @thaystg Issue DetailsUsing RollForward=major as suggested by @vitek-karas
|
|
/backport to release/7.0-staging |
|
/backport to release/6.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/5755037015 |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/5755037616 |
|
@thaystg 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: Rework on 88919 as suggested by @vitek-karas
Using index info to reconstruct a base tree...
M src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj
A src/mono/wasm/debugger/BrowserDebugHost/runtimeconfig.template.json
Falling back to patching base and 3-way merge...
Auto-merging src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj
CONFLICT (content): Merge conflict in src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Rework on 88919 as suggested by @vitek-karas
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! |
|
@thaystg 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. |
vitek-karas
left a comment
There was a problem hiding this comment.
I assume it works (as in it fixes the original problem).
Using RollForward=major as suggested by @vitek-karas