-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Comments/refactoring for clarification (#14176) #14217
Conversation
Thank you for your pull request. We are auto-formatting your source code to follow our code guidelines. |
/backport to release/8.0.1xx-preview3 |
Started backporting to release/8.0.1xx-preview3: https://github.com/dotnet/maui/actions/runs/4545744100 |
@rmarinho backporting to release/8.0.1xx-preview3 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Comments/refactoring for clarification
.git/rebase-apply/patch:40: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
CONFLICT (content): Merge conflict in src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.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 Comments/refactoring for clarification
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! |
@rmarinho an error occurred while backporting to release/8.0.1xx-preview3, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Description of Change
Refactoring and clarification of #14176