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

Add ParameterDescriptor to 'Using parameters in a class (C++)' (backport #2865) #3113

Merged
merged 2 commits into from
Oct 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2022

This is an automatic backport of pull request #2865 done by Mergify.
Cherry-pick of 87bf20a has failed:

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

You are currently cherry-picking commit 87bf20a.
  (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:   source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-Python.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.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

* Rename node name in "Using parameters" C++ tutorial to be consistent with Python tutorial.

Signed-off-by: Tan Chian Fern <chianfern@gmail.com>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit 87bf20a)

# Conflicts:
#	source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst
@mergify mergify bot added the conflicts label Oct 18, 2022
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
@clalancette clalancette merged commit 20d170f into foxy Oct 18, 2022
@clalancette clalancette deleted the mergify/bp/foxy/pr-2865 branch October 18, 2022 13:45
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