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

[ShadowContainer][Docs] Simple improvement for easier reading and understanding (backport #709) #717

Merged
merged 2 commits into from
Aug 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2023

This is an automatic backport of pull request #709 done by Mergify.
Cherry-pick of 30fd1b5 has failed:

On branch mergify/bp/legacy/3x/pr-709
Your branch is up to date with 'origin/legacy/3x'.

You are currently cherry-picking commit 30fd1b5.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   doc/controls/ShadowContainer.md

no changes added to commit (use "git add" and/or "git commit -a")

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

…erstanding (#709)

Co-authored-by: Rafael Rosa <rafaelmendesrosa@gmail.com>
(cherry picked from commit 30fd1b5)

# Conflicts:
#	doc/controls/ShadowContainer.md
@Xiaoy312
Copy link
Contributor

should probably wait after #703

@agneszitte agneszitte linked an issue Aug 15, 2023 that may be closed by this pull request
@Xiaoy312 Xiaoy312 merged commit 7d24cdd into legacy/3x Aug 22, 2023
4 checks passed
@Xiaoy312 Xiaoy312 deleted the mergify/bp/legacy/3x/pr-709 branch August 22, 2023 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Specs] ShadowContainer
2 participants