Skip to content

Add $ to Intermediate and Miscellaneous (backport #5351) #5381

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 26, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 26, 2025


This is an automatic backport of pull request #5351 done by [Mergify](https://mergify.com).

Signed-off-by: Nils-Christian Iseke <[email protected]>
Signed-off-by: Nils-Christian Iseke <[email protected]>
Signed-off-by: Christophe Bedard <[email protected]>
Co-authored-by: Christophe Bedard <[email protected]>
(cherry picked from commit dda0a68)

# Conflicts:
#	source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Cpp.rst
@mergify mergify bot added the conflicts label Apr 26, 2025
Copy link
Contributor Author

mergify bot commented Apr 26, 2025

Cherry-pick of dda0a68 has failed:

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

You are currently cherry-picking commit dda0a68.
  (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/Intermediate/Tf2/Using-Stamped-Datatypes-With-Tf2-Ros-MessageFilter.rst
	modified:   source/Tutorials/Intermediate/URDF/Using-Xacro-to-Clean-Up-a-URDF-File.rst
	modified:   source/Tutorials/Intermediate/Writing-an-Action-Server-Client/Py.rst
	modified:   source/Tutorials/Miscellaneous/Building-Realtime-rt_preempt-kernel-for-ROS-2.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Cpp.rst

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

Signed-off-by: Christophe Bedard <[email protected]>
Copy link

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/14684786279/artifacts/3015326279.

To view the resulting site:

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

@christophebedard christophebedard merged commit d2bbbe1 into humble Apr 26, 2025
5 checks passed
@christophebedard christophebedard deleted the mergify/bp/humble/pr-5351 branch April 26, 2025 20: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.

2 participants