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: improve usage of :::note (backport #17132) #17134

Merged
merged 2 commits into from
Jul 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 26, 2023

This is an automatic backport of pull request #17132 done by Mergify.
Cherry-pick of 2c5f36c has failed:

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

You are currently cherry-picking commit 2c5f36c25.
  (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/docs/basics/02-query-lifecycle.md
	modified:   docs/docs/basics/03-accounts.md
	modified:   docs/docs/basics/04-gas-fees.md
	modified:   docs/docs/building-apps/01-app-go-v2.md
	modified:   docs/docs/building-apps/02-app-mempool.md
	modified:   docs/docs/building-modules/01-intro.md
	modified:   docs/docs/building-modules/01-module-manager.md
	modified:   docs/docs/building-modules/02-messages-and-queries.md
	modified:   docs/docs/building-modules/03-msg-services.md
	modified:   docs/docs/building-modules/04-query-services.md
	modified:   docs/docs/building-modules/05-beginblock-endblock.md
	modified:   docs/docs/building-modules/06-keeper.md
	modified:   docs/docs/building-modules/07-invariants.md
	modified:   docs/docs/building-modules/08-genesis.md
	modified:   docs/docs/building-modules/09-module-interfaces.md
	modified:   docs/docs/building-modules/10-autocli.md
	modified:   docs/docs/building-modules/13-upgrade.md
	modified:   docs/docs/building-modules/15-depinject.md
	modified:   docs/docs/core/00-baseapp.md
	modified:   docs/docs/core/01-transactions.md
	modified:   docs/docs/core/02-context.md
	modified:   docs/docs/core/03-node.md
	modified:   docs/docs/core/04-store.md
	modified:   docs/docs/core/05-encoding.md
	modified:   docs/docs/core/08-events.md
	modified:   docs/docs/run-node/01-run-node.md
	modified:   docs/docs/run-node/02-interact-node.md
	modified:   x/auth/tx/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/docs/basics/01-tx-lifecycle.md
	both modified:   docs/docs/building-apps/03-app-upgrade.md
	both modified:   docs/docs/building-modules/14-simulator.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

(cherry picked from commit 2c5f36c)

# Conflicts:
#	docs/docs/basics/01-tx-lifecycle.md
#	docs/docs/building-apps/03-app-upgrade.md
#	docs/docs/building-modules/14-simulator.md
@mergify mergify bot requested a review from a team as a code owner July 26, 2023 08:56
@mergify mergify bot added the conflicts label Jul 26, 2023
@julienrbrt julienrbrt merged commit 94758c1 into release/v0.47.x Jul 26, 2023
22 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-17132 branch July 26, 2023 09:17
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.

1 participant