Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2025

Updating to a more accurate description of the expected output (both cpp and py versions).


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

* Update Using-Parameters-In-A-Class-Python.rst

Updating to a more accurate description of the expected output (py).

* Update Using-Parameters-In-A-Class-CPP.rst

Updating to a more accurate description of the expected output (cpp).

(cherry picked from commit 8a6ad2f)

# Conflicts:
#	source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst
#	source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-Python.rst
@mergify
Copy link
Contributor Author

mergify bot commented Jun 4, 2025

Cherry-pick of 8a6ad2f has failed:

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

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

@mergify mergify bot added the conflicts label Jun 4, 2025
@mergify mergify bot mentioned this pull request Jun 4, 2025
Signed-off-by: Tomoya Fujita <[email protected]>
Copy link
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm with green CI.

@github-actions
Copy link

github-actions bot commented Jun 4, 2025

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/15448492413/artifacts/3261165710.

To view the resulting site:

  1. Click on the above link to download the artifacts archive
  2. Extract it
  3. Open html-artifacts-5696/index.html in your favorite browser

@fujitatomoya fujitatomoya merged commit 24bf4ee into humble Jun 5, 2025
5 checks passed
@fujitatomoya fujitatomoya deleted the mergify/bp/humble/pr-3532 branch June 5, 2025 03:44
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.

4 participants