Skip to content

proto: Update README (backport #1648)#1653

Merged
thanethomson merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-1648
Nov 17, 2023
Merged

proto: Update README (backport #1648)#1653
thanethomson merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-1648

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 17, 2023

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

On branch mergify/bp/v0.34.x/pr-1648
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit ee99bf534.
  (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:   proto/README.md

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/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

@mergify mergify bot requested a review from a team as a code owner November 17, 2023 20:42
@mergify mergify bot added the conflicts label Nov 17, 2023
@thanethomson
Copy link
Contributor

@Mergifyio rebase

* proto: Update README

Signed-off-by: Thane Thomson <connect@thanethomson.com>

* Add versions to table for clarity

Signed-off-by: Thane Thomson <connect@thanethomson.com>

---------

Signed-off-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit ee99bf5)

# Conflicts:
#	proto/README.md
@mergify
Copy link
Contributor Author

mergify bot commented Nov 17, 2023

rebase

✅ Branch has been successfully rebased

@thanethomson thanethomson force-pushed the mergify/bp/v0.34.x/pr-1648 branch from 5f942b7 to 3fb08a9 Compare November 17, 2023 20:51
Signed-off-by: Thane Thomson <connect@thanethomson.com>
Signed-off-by: Thane Thomson <connect@thanethomson.com>
@thanethomson thanethomson merged commit 20de39f into v0.34.x Nov 17, 2023
@thanethomson thanethomson deleted the mergify/bp/v0.34.x/pr-1648 branch November 17, 2023 21:08
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