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: use gogofaster plugin (backport #795) #798

Merged
merged 2 commits into from
Jul 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2023

This is an automatic backport of pull request #795 done by Mergify.
Cherry-pick of d6844ac has failed:

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

You are currently cherry-picking commit d6844ac.
  (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:   buf.gen.yaml
	modified:   proto/changeset.pb.go

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

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

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit d6844ac)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner June 29, 2023 10:48
@mergify mergify bot added the conflicts label Jun 29, 2023
@mergify mergify bot mentioned this pull request Jun 29, 2023
@tac0turtle tac0turtle enabled auto-merge (squash) July 18, 2023 13:08
@tac0turtle tac0turtle merged commit 633397c into release/v0.20.x Jul 18, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.20.x/pr-795 branch July 18, 2023 13:13
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.

2 participants