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

feat: add lightweight styling to divider (backport #765) #785

Merged
merged 1 commit into from
Aug 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2023

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

On branch mergify/bp/release/stable/3.1/pr-765
Your branch is up to date with 'origin/release/stable/3.1'.

You are currently cherry-picking commit cd6b89a.
  (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:   doc/controls-styles.md
	new file:   doc/controls/Divider.md
	modified:   doc/lightweight-styling.md
	modified:   doc/toc.yml
	modified:   src/library/Uno.Toolkit.Material/Styles/Controls/v2/Divider.xaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   samples/Directory.Packages.props
	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

@mergify mergify bot added the conflicts label Aug 30, 2023
@mergify mergify bot mentioned this pull request Aug 30, 2023
18 tasks
@agneszitte
Copy link
Contributor

@Marc-Antoine-Soucy if you can help fix the merge conflicts for the backports, please

(cherry picked from commit cd6b89a)

# Conflicts:
# samples/Directory.Packages.props
# src/Directory.Packages.props
@agneszitte agneszitte force-pushed the mergify/bp/release/stable/3.1/pr-765 branch from 2b01d37 to 9a149bb Compare August 31, 2023 20:06
@agneszitte
Copy link
Contributor

@Marc-Antoine-Soucy if you can help fix the merge conflicts for the backports, please

I fixed the merge conflicts

@agneszitte agneszitte enabled auto-merge (squash) August 31, 2023 20:08
@agneszitte agneszitte merged commit 91d8e0b into release/stable/3.1 Aug 31, 2023
28 checks passed
@agneszitte agneszitte deleted the mergify/bp/release/stable/3.1/pr-765 branch August 31, 2023 21:40
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.

2 participants