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

Create doc file for chained controllers (backport #985) #1131

Merged
merged 2 commits into from
Oct 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2023

This is an automatic backport of pull request #985 done by Mergify.
Cherry-pick of 185fbea has failed:

On branch mergify/bp/humble/pr-985
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 185fbea.
  (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:
	new file:   controller_manager/doc/images/chaining_example2.png
	modified:   doc/index.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      controller_manager/doc/controller_chaining.rst

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

Co-authored-by: Bence Magyar <[email protected]>
Co-authored-by: Christoph Fröhlich <[email protected]>
(cherry picked from commit 185fbea)

# Conflicts:
#	controller_manager/doc/controller_chaining.rst
@christophfroehlich
Copy link
Contributor

This failed because of the backport #1106 of #1104
Which information is correct on humble @destogl?

@bmagyar bmagyar merged commit ced3c65 into humble Oct 19, 2023
12 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-985 branch October 19, 2023 14:54
@christophfroehlich
Copy link
Contributor

thanks, this fixed the sphinx job 🙏

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.

3 participants