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

bump skiasharp to 2.88.5 (backport #758) #759

Merged
merged 2 commits into from
Aug 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2023

This is an automatic backport of pull request #758 done by Mergify.
Cherry-pick of f760d54 has failed:

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

You are currently cherry-picking commit f760d54.
  (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)

Changes to be committed:
	modified:   samples/Directory.Packages.props

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Directory.Packages.props

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

(cherry picked from commit f760d54)

# Conflicts:
#	src/Directory.Packages.props
@mergify mergify bot added the conflicts label Aug 25, 2023
@mergify mergify bot mentioned this pull request Aug 25, 2023
@Xiaoy312 Xiaoy312 merged commit d16f9ea into legacy/3x Aug 25, 2023
28 checks passed
@Xiaoy312 Xiaoy312 deleted the mergify/bp/legacy/3x/pr-758 branch August 25, 2023 18:35
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.

3 participants