Skip to content

doc: Added explanation of preceding/following controllers (backport #2192) #2193

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

Merged
merged 2 commits into from
Apr 17, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 17, 2025

Resolves #2189 .

This PR adds explanation of what preceding/following controller means.

I also broke the rule and attached an irrelevant fix of grammar in the paragraph directly preceding the paragraph I added. I hope it's not a big no no :)


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

(cherry picked from commit 14ea4a6)

# Conflicts:
#	controller_manager/doc/controller_chaining.rst
@mergify mergify bot added the conflicts label Apr 17, 2025
Copy link
Contributor Author

mergify bot commented Apr 17, 2025

Cherry-pick of 14ea4a6 has failed:

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

You are currently cherry-picking commit 14ea4a6.
  (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 <file>..." to mark resolution)
	both modified:   controller_manager/doc/controller_chaining.rst

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@christophfroehlich christophfroehlich merged commit 696f1a3 into humble Apr 17, 2025
3 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-2192 branch April 17, 2025 15:58
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