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 ordering (backport #15387) #15389

Merged
merged 2 commits into from
Mar 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2023

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

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

You are currently cherry-picking commit a392bae9b.
  (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/building-modules/01-intro.md
	renamed:    docs/docs/building-modules/09-autocli.md -> docs/docs/building-modules/10-autocli.md
	renamed:    docs/docs/building-modules/10-structure.md -> docs/docs/building-modules/11-structure.md
	renamed:    docs/docs/building-modules/11-errors.md -> docs/docs/building-modules/12-errors.md
	renamed:    docs/docs/building-modules/12-upgrade.md -> docs/docs/building-modules/13-upgrade.md
	renamed:    docs/docs/building-modules/13-simulator.md -> docs/docs/building-modules/14-simulator.md
	renamed:    docs/docs/building-modules/14-depinject.md -> docs/docs/building-modules/15-depinject.md
	renamed:    docs/docs/building-modules/15-testing.md -> docs/docs/building-modules/16-testing.md
	modified:   docs/docs/core/12-simulation.md
	modified:   docs/docs/core/15-upgrade.md
	deleted:    docs/docs/pkg/_category_.json

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/rfc/_category_.json

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 a392bae)

# Conflicts:
#	docs/rfc/_category_.json
@mergify mergify bot requested a review from a team as a code owner March 14, 2023 13:01
@mergify mergify bot added the conflicts label Mar 14, 2023
@julienrbrt julienrbrt merged commit b63e55b into release/v0.47.x Mar 14, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-15387 branch March 14, 2023 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants