Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2023

This is an automatic backport of pull request #368 done by Mergify.
Cherry-pick of 28baba3 has failed:

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

You are currently cherry-picking commit 28baba3ed.
  (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/app-dev/README.md
	modified:   docs/introduction/quick-start.md
	modified:   docs/qa/README.md
	renamed:    docs/qa/v034/CometBFT.md -> docs/qa/v034/README.md
	modified:   docs/qa/v034/TMCore.md
	modified:   docs/tools/README.md
	modified:   docs/tutorials/README.md
	new file:   rpc/openapi/README.md
	renamed:    rpc/openapi/index.html -> rpc/openapi/rpc.html
	modified:   spec/abci/README.md
	modified:   spec/abci/abci++_basic_concepts.md
	modified:   spec/abci/abci++_client_server.md
	modified:   spec/abci/abci++_methods.md
	modified:   spec/consensus/evidence.md
	modified:   spec/consensus/light-client/README.md
	modified:   spec/consensus/signing.md
	modified:   spec/core/data_structures.md
	modified:   spec/core/encoding.md
	modified:   spec/core/genesis.md
	modified:   spec/core/state.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/core/rpc.md
	both modified:   docs/tools/debugging.md
	both modified:   docs/tutorials/go-built-in.md
	both modified:   docs/tutorials/go.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

* fixing broken link quick-start (#319)

* fix link to point to relative page (#319)

* fix link to point to rpc page (#319)

* fix link that works for rpc (#319)

* adding front matter to trigger hooks (#319)

* add frontmatter to adr page (#319)

* make link to configuration page relative (#319)

* remove irrelevant text (#319)

* updating relative link and removing irrelevant text (#319)

* remove front matter from ADR (#319)

* fixing broken links unders docs/tools (#319)

* fixing broken links under spec/core (#319)

* fixing broken links in spec/abci home (#319)

* fix uparrows rendering and broken links (#319)

* fixing links, comments on abci methods (#319)

* fixing links in tutorials (#319)

* adding a landing page for Apps (#319)

* renaming qa v0.34 page to show in navigation (#319)

* rename title of page for navigation (#319)

* fixing links on abci client server (#319)

* changes to allow RPC top level navigation on docs site (#319)

* fixing some more broken references (#319)

* reverting link change as per review (#319)

* reverting link change as per review (#319)

* reverting link in app-dev as per review (#319)

(cherry picked from commit 28baba3)

# Conflicts:
#	docs/core/rpc.md
#	docs/tools/debugging.md
#	docs/tutorials/go-built-in.md
#	docs/tutorials/go.md
@mergify mergify bot requested review from a team as code owners February 22, 2023 22:23
@mergify mergify bot added the conflicts label Feb 22, 2023
@adizere
Copy link
Contributor

adizere commented Feb 23, 2023

Hope the conflicts are fixed now. 50cb578..c381aea

@andynog what do you think?

Copy link

@cason cason left a comment

Choose a reason for hiding this comment

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

Some renaming required to have links to this branch/version.

Copy link
Contributor

@andynog andynog left a comment

Choose a reason for hiding this comment

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

resolved suggestions and looks good to me know

@andynog andynog requested a review from thanethomson February 23, 2023 22:27
@andynog
Copy link
Contributor

andynog commented Feb 23, 2023

Hope the conflicts are fixed now. 50cb578..c381aea

@andynog what do you think?

that's good

@andynog andynog requested review from cason, andynog and adizere February 23, 2023 22:28
@andynog andynog merged commit ed4430a into v0.37.x Feb 24, 2023
@andynog andynog deleted the mergify/bp/v0.37.x/pr-368 branch February 24, 2023 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants