Skip to content

Conversation

@thaystg
Copy link
Member

@thaystg thaystg commented Mar 15, 2024

@dotnet-policy-service
Copy link
Contributor

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

@thaystg
Copy link
Member Author

thaystg commented Mar 15, 2024

/backport to release/8.0-staging

@github-actions
Copy link
Contributor

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

@github-actions
Copy link
Contributor

@thaystg backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix inspect Span<byte>
Using index info to reconstruct a base tree...
A	src/mono/browser/debugger/DebuggerTestSuite/MiscTests.cs
A	src/mono/browser/debugger/tests/debugger-test/debugger-test.cs
M	src/mono/mono/component/debugger-agent.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs
CONFLICT (content): Merge conflict in src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs
Auto-merging src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs
Auto-merging src/mono/mono/component/debugger-agent.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix inspect Span<byte>
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

@thaystg an error occurred while backporting to release/8.0-staging, please check the run log for details!

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

@thaystg thaystg merged commit 940b76b into dotnet:main Mar 18, 2024
thaystg added a commit that referenced this pull request Apr 2, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Apr 18, 2024
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.

Crash on android device with "Assertion at /__w/1/s/src/mono/mono/component/debugger-agent.c:5652"

2 participants