Closed JamesNK closed 1 week ago
/backport to release/9.0
Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11965753843
@JamesNK backporting to release/9.0 failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Resource masking fixes
Using index info to reconstruct a base tree...
M src/Aspire.Dashboard/Components/Controls/GridValue.razor
M src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor
M src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
M src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
CONFLICT (content): Merge conflict in src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
Auto-merging src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
CONFLICT (content): Merge conflict in src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
Auto-merging src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor
Auto-merging src/Aspire.Dashboard/Components/Controls/GridValue.razor
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 Resource masking fixes
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@JamesNK an error occurred while backporting to release/9.0, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
Description
Bug repo:
PR improves how state is tracked and updated. Adds integration tests.
Fixes https://github.com/dotnet/aspire/issues/6557
Checklist
<remarks />
and<code />
elements on your triple slash comments?breaking-change
template):doc-idea
template):