Skip to content

[wasm][debugger] Using "RollForward": major for BrowserDebugHost#89960

Merged
thaystg merged 1 commit intodotnet:mainfrom
thaystg:thays_rework_88919
Aug 4, 2023
Merged

[wasm][debugger] Using "RollForward": major for BrowserDebugHost#89960
thaystg merged 1 commit intodotnet:mainfrom
thaystg:thays_rework_88919

Conversation

@thaystg
Copy link
Member

@thaystg thaystg commented Aug 3, 2023

Using RollForward=major as suggested by @vitek-karas

@ghost
Copy link

ghost commented Aug 3, 2023

Tagging subscribers to this area: @thaystg
See info in area-owners.md if you want to be subscribed.

Issue Details

Using RollForward=major as suggested by @vitek-karas

Author: thaystg
Assignees: thaystg
Labels:

area-Debugger-mono

Milestone: -

@thaystg
Copy link
Member Author

thaystg commented Aug 3, 2023

/backport to release/7.0-staging

@thaystg
Copy link
Member Author

thaystg commented Aug 3, 2023

/backport to release/6.0-staging

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/5755037015

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/5755037616

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

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

Please backport manually!

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

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

Copy link
Member

@vitek-karas vitek-karas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume it works (as in it fixes the original problem).

@thaystg thaystg merged commit a3abc75 into dotnet:main Aug 4, 2023
@ghost ghost locked as resolved and limited conversation to collaborators Sep 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants