Fix source column displaying executable args #6619
Merged
Conversation
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
davidfowl
approved these changes
Nov 6, 2024
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11713945866 |
|
@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: Fix source column displaying executable args
Using index info to reconstruct a base tree...
M src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
CONFLICT (content): Merge conflict in src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.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 Fix source column displaying executable args
Error: The process '/usr/bin/git' failed with exit code 128Please 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. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6C63
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.
Description
Fixes #6585
After:
Checklist
<remarks />and<code />elements on your triple slash comments?breaking-changetemplate):doc-ideatemplate):Microsoft Reviewers: Open in CodeFlow