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

docs: set proper v0.47.x buf commit (backport #15142) #15143

Merged
merged 2 commits into from
Feb 23, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2023

This is an automatic backport of pull request #15142 done by Mergify.
Cherry-pick of 7d28f63 has failed:

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

You are currently cherry-picking commit 7d28f6329.
  (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:
	deleted:    third_party/proto/README.md
	deleted:    third_party/proto/google/protobuf/any.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   proto/README.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

(cherry picked from commit 7d28f63)

# Conflicts:
#	proto/README.md
@mergify mergify bot requested a review from a team as a code owner February 23, 2023 21:40
@mergify mergify bot added the conflicts label Feb 23, 2023
@mergify mergify bot mentioned this pull request Feb 23, 2023
19 tasks
@julienrbrt julienrbrt enabled auto-merge (squash) February 23, 2023 21:42
@julienrbrt julienrbrt merged commit b123507 into release/v0.47.x Feb 23, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-15142 branch February 23, 2023 21:43
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