[Tizen] Add Shell FlyoutBackDrop #11027
Conversation
ghost
added
the
|
Hey there @JoonghyunCho! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed. |
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/maui/actions/runs/3464807530 |
|
@mattleibow an error occurred while backporting to main, please check the run log for details! Error: @mattleibow is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=mattleibow |
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/maui/actions/runs/3464823813 |
|
@mattleibow backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [Tizen] Add Shell FlyoutBackDrop
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Handlers/Shell/Tizen/ShellView.cs
M src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
CONFLICT (content): Merge conflict in src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
Auto-merging src/Controls/src/Core/Handlers/Shell/Tizen/ShellView.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 [Tizen] Add Shell FlyoutBackDrop
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! |
|
@mattleibow an error occurred while backporting to main, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Description of Change
default / solid color / gradient color
