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: fix namespace rules in x/blob/README.md (backport #2368) #2372

Merged
merged 2 commits into from
Aug 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 28, 2023

This is an automatic backport of pull request #2368 done by Mergify.
Cherry-pick of 55f4360 has failed:

On branch mergify/bp/v1.x/pr-2368
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 55f4360.
  (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:   x/blob/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

Closes #2350

(cherry picked from commit 55f4360)

# Conflicts:
#	x/blob/README.md
@mergify mergify bot added the conflicts label Aug 28, 2023
@celestia-bot celestia-bot requested a review from a team August 28, 2023 17:03
@github-actions github-actions bot added the bot item was created by a bot label Aug 28, 2023
@codecov-commenter
Copy link

codecov-commenter commented Aug 28, 2023

Codecov Report

❗ No coverage uploaded for pull request base (v1.x@695988e). Click here to learn what that means.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.x    #2372   +/-   ##
=======================================
  Coverage        ?   20.55%           
=======================================
  Files           ?      138           
  Lines           ?    15736           
  Branches        ?        0           
=======================================
  Hits            ?     3235           
  Misses          ?    12194           
  Partials        ?      307           

Copy link
Contributor

@staheri14 staheri14 left a comment

Choose a reason for hiding this comment

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

It looks like the final rendered file does not match the changes made by the original PR.

@rootulp rootulp removed the conflicts label Aug 28, 2023
@rootulp rootulp requested a review from staheri14 August 28, 2023 18:02
@rootulp rootulp self-assigned this Aug 28, 2023
@celestia-bot celestia-bot requested a review from a team August 28, 2023 18:02
@rootulp rootulp enabled auto-merge (squash) August 28, 2023 18:03
Copy link
Contributor

@staheri14 staheri14 left a comment

Choose a reason for hiding this comment

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

Looks good now!

@rootulp rootulp merged commit 8c7dd28 into v1.x Aug 28, 2023
21 checks passed
@rootulp rootulp deleted the mergify/bp/v1.x/pr-2368 branch August 28, 2023 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants