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: dead link (backport #2593) #2594

Merged
merged 2 commits into from
Sep 28, 2023
Merged

fix: dead link (backport #2593) #2594

merged 2 commits into from
Sep 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2023

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

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

You are currently cherry-picking commit d4737b4.
  (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:   docs/architecture/adr-019-strict-inflation-schedule.md
	modified:   specs/src/specs/ante_handler.md
	modified:   specs/src/specs/data_structures.md
	modified:   specs/src/specs/public_key_cryptography.md
	modified:   specs/src/specs/resource_pricing.md
	modified:   x/blob/types/payforblob.go
	modified:   x/qgb/overview.md

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

## Overview

fixes dead link

(cherry picked from commit d4737b4)

# Conflicts:
#	x/upgrade/README.md
@mergify mergify bot added the conflicts label Sep 28, 2023
@celestia-bot celestia-bot requested a review from a team September 28, 2023 16:11
@github-actions github-actions bot added the bot item was created by a bot label Sep 28, 2023
@github-actions
Copy link

PR Preview Action v1.4.4
🚀 Deployed preview to https://celestiaorg.github.io/celestia-app/pr-preview/pr-2594/
on branch gh-pages at 2023-09-28 16:11 UTC

Copy link
Member

@rach-id rach-id left a comment

Choose a reason for hiding this comment

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

the cherry pick failed, we should fix the conflicts before merging

@celestia-bot celestia-bot requested a review from a team September 28, 2023 17:25
@evan-forbes evan-forbes enabled auto-merge (squash) September 28, 2023 17:27
@evan-forbes evan-forbes merged commit a1f5361 into v1.x Sep 28, 2023
24 checks passed
@evan-forbes evan-forbes deleted the mergify/bp/v1.x/pr-2593 branch September 28, 2023 19:47
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

2 participants