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

Add Sai to mergify settings (backport #1416) #1417

Merged
merged 2 commits into from
Dec 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 9, 2024


This is an automatic backport of pull request #1416 done by [Mergify](https://mergify.com).

(cherry picked from commit 330b9e4)

# Conflicts:
#	.github/mergify.yml
@mergify mergify bot added the conflicts label Dec 9, 2024
Copy link
Contributor Author

mergify bot commented Dec 9, 2024

Cherry-pick of 330b9e4 has failed:

On branch mergify/bp/humble/pr-1416
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 330b9e4.
  (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:   .github/mergify.yml

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@christophfroehlich christophfroehlich merged commit 3fba6fd into humble Dec 9, 2024
2 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1416 branch December 9, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant