Skip to content
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

chore: Addressing Shadows PR remaining comments (backport #696) #704

Closed
wants to merge 15 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2023

This is an automatic backport of pull request #696 done by Mergify.
Cherry-pick of 1ce1eb5 has failed:

On branch mergify/bp/legacy/3x/pr-696
Your branch is up to date with 'origin/legacy/3x'.

You are currently cherry-picking commit 1ce1eb5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Converters/HexToColorConverter.cs
	deleted by us:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs
	deleted by us:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Properties.cs
	deleted by us:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Copy link
Contributor

@Xiaoy312 Xiaoy312 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pending after #703

@agneszitte agneszitte linked an issue Aug 15, 2023 that may be closed by this pull request
@agneszitte
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Aug 19, 2023

refresh

✅ Pull request refreshed

@agneszitte
Copy link
Contributor

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Aug 19, 2023

update

❌ Base branch update has failed

merge conflict between base and head
err-code: 82E33

@pictos pictos force-pushed the mergify/bp/legacy/3x/pr-696 branch from e5e9691 to 4ec584b Compare August 20, 2023 02:30
@pictos pictos closed this Aug 20, 2023
@pictos pictos deleted the mergify/bp/legacy/3x/pr-696 branch August 20, 2023 02:43
@pictos pictos restored the mergify/bp/legacy/3x/pr-696 branch August 20, 2023 02:45
@pictos pictos reopened this Aug 20, 2023
@pictos pictos force-pushed the mergify/bp/legacy/3x/pr-696 branch from 4ec584b to ed1d54e Compare August 20, 2023 02:52
@pictos pictos mentioned this pull request Aug 20, 2023
@pictos
Copy link
Contributor

pictos commented Aug 20, 2023

#739 is in a better shape

@mergify mergify bot deleted the mergify/bp/legacy/3x/pr-696 branch August 21, 2023 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Specs] ShadowContainer
6 participants