Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 20, 2023

This is an automatic backport of pull request #17071 done by Mergify.
Cherry-pick of 3bbc370 has failed:

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

You are currently cherry-picking commit 3bbc3700b.
  (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/PULL_REQUEST_TEMPLATE.md
	modified:   .github/workflows/lint.yml
	modified:   scripts/go-lint-all.bash

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .golangci.yml
	both modified:   Makefile

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

(cherry picked from commit 3bbc370)

# Conflicts:
#	.golangci.yml
#	Makefile
@mergify mergify bot requested a review from a team July 20, 2023 13:42
@mergify mergify bot added the conflicts label Jul 20, 2023
@github-prbot github-prbot requested review from a team, atheeshp and kocubinski and removed request for a team July 20, 2023 13:42
@julienrbrt julienrbrt closed this Jul 20, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17071 branch July 20, 2023 14:41
@julienrbrt julienrbrt restored the mergify/bp/release/v0.50.x/pr-17071 branch July 20, 2023 14:49
@julienrbrt julienrbrt reopened this Jul 20, 2023
@github-prbot github-prbot requested a review from a team July 20, 2023 14:49
Copy link
Contributor

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

This has issues, DNM yet.

@julienrbrt
Copy link
Contributor

Fixed in #17080 :)

@julienrbrt julienrbrt enabled auto-merge (squash) July 20, 2023 16:55
@julienrbrt julienrbrt disabled auto-merge July 20, 2023 16:58
@julienrbrt julienrbrt merged commit ab140e5 into release/v0.50.x Jul 20, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17071 branch July 20, 2023 16:58
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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