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: Anys Usage, Events & small cleanups (bp #8895) #8911

Merged
merged 3 commits into from
Mar 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 17, 2021

This is an automatic backport of pull request #8895 done by Mergify.

Cherry-pick of 1a4418b has failed:

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

You are currently cherry-picking commit 1a4418b32.
  (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/basics/accounts.md
	modified:   docs/building-modules/invariants.md
	modified:   docs/building-modules/simulator.md
	modified:   docs/core/baseapp.md
	modified:   docs/core/encoding.md
	modified:   docs/core/store.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/architecture/adr-041-in-place-store-migrations.md
	both modified:   docs/basics/app-anatomy.md
	both modified:   docs/core/events.md

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

Co-authored-by: Barrie Byron <[email protected]>
Co-authored-by: Alessio Treglia <[email protected]>
(cherry picked from commit 1a4418b)

# Conflicts:
#	docs/architecture/adr-041-in-place-store-migrations.md
#	docs/basics/app-anatomy.md
#	docs/core/events.md
@mergify mergify bot added the conflicts label Mar 17, 2021
@amaury1093 amaury1093 added T:Docs Changes and features related to documentation. and removed conflicts labels Mar 17, 2021
@alessio alessio merged commit 16187a8 into release/v0.42.x Mar 17, 2021
@alessio alessio deleted the mergify/bp/release/v0.42.x/pr-8895 branch March 17, 2021 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T:Docs Changes and features related to documentation.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants