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

update deps and add mergify config for v0.26.x release branch (backport #1853) #1854

Merged
merged 2 commits into from
Mar 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 21, 2024


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

@mergify mergify bot added the conflicts label Mar 21, 2024
Copy link
Contributor Author

mergify bot commented Mar 21, 2024

Cherry-pick of 7866ee2 has failed:

On branch mergify/bp/release/v0.26.x/pr-1853
Your branch is up to date with 'origin/release/v0.26.x'.

You are currently cherry-picking commit 7866ee2f.
  (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:   .github/mergify.yml
	modified:   go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum

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

@nddeluca nddeluca merged commit e96fd17 into release/v0.26.x Mar 22, 2024
10 checks passed
@nddeluca nddeluca deleted the mergify/bp/release/v0.26.x/pr-1853 branch March 22, 2024 22:47
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.

1 participant