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: update wharfie to v0.6.3 (backport #584) #586

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 1, 2023

This is an automatic backport of pull request #584 done by Mergify.
Cherry-pick of 2d399fa has failed:

On branch mergify/bp/v1.1/pr-584
Your branch is up to date with 'origin/v1.1'.

You are currently cherry-picking commit 2d399fa.
  (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:   package/harvester-os/Dockerfile

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

@mergify mergify bot added the conflicts label Nov 1, 2023
@mergify mergify bot mentioned this pull request Nov 1, 2023
Signed-off-by: PoAn Yang <poan.yang@suse.com>
Copy link
Contributor

@Vicente-Cheng Vicente-Cheng left a comment

Choose a reason for hiding this comment

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

LGTM!

@bk201 bk201 merged commit 8baa44c into v1.1 Nov 1, 2023
5 checks passed
@FrankYang0529 FrankYang0529 deleted the mergify/bp/v1.1/pr-584 branch November 1, 2023 08:54
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