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: typo in comment (backport #17635) #17637

Merged
merged 2 commits into from
Sep 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 6, 2023

This is an automatic backport of pull request #17635 done by Mergify.
Cherry-pick of 01b8be0 has failed:

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

You are currently cherry-picking commit 01b8be0c8.
  (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:   client/config/config.go

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

(cherry picked from commit 01b8be0)

# Conflicts:
#	client/config/config.go
@mergify mergify bot requested a review from a team as a code owner September 6, 2023 09:54
@mergify mergify bot added the conflicts label Sep 6, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) September 6, 2023 09:56
@github-actions github-actions bot added the C:CLI label Sep 6, 2023
@julienrbrt julienrbrt merged commit 1dfa761 into release/v0.47.x Sep 6, 2023
22 of 23 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-17635 branch September 6, 2023 10:26
@faddat faddat mentioned this pull request Mar 20, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants