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

fix: Templatebound Margin to remove hardcoded margin (backport #715) #774

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 #715 done by Mergify.
Cherry-pick of df9e747 has failed:

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

You are currently cherry-picking commit df9e747.
  (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 <file>..." to mark resolution)
	both modified:   src/library/Uno.Toolkit.Material/Styles/Controls/v2/CardContentControl.xaml

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

@jeromelaban
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Aug 30, 2023

rebase

✅ Branch has been successfully rebased

@jeromelaban jeromelaban force-pushed the mergify/bp/release/stable/3.1/pr-715 branch from 134492f to d285e5e Compare August 30, 2023 01:13
(cherry picked from commit df9e747)

# Conflicts:
# src/library/Uno.Toolkit.Material/Styles/Controls/v2/CardContentControl.xaml
@agneszitte agneszitte force-pushed the mergify/bp/release/stable/3.1/pr-715 branch from d285e5e to 354cb2f Compare August 31, 2023 19:15
@agneszitte agneszitte enabled auto-merge (squash) August 31, 2023 19:27
@agneszitte agneszitte merged commit e0abbee into release/stable/3.1 Aug 31, 2023
29 checks passed
@agneszitte agneszitte deleted the mergify/bp/release/stable/3.1/pr-715 branch August 31, 2023 21:02
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.

None yet

2 participants