Skip to content

Add $ to Demos (backport #5352) #5392

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 27, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 27, 2025


This is an automatic backport of pull request #5352 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 8d1b99d)

# Conflicts:
#	source/Tutorials/Demos/Action-Introspection.rst
#	source/Tutorials/Demos/Logging-and-logger-configuration.rst
#	source/Tutorials/Demos/Quality-of-Service.rst
#	source/Tutorials/Demos/Real-Time-Programming.rst
#	source/Tutorials/Demos/Service-Introspection.rst
#	source/Tutorials/Demos/dummy-robot-demo.rst
@mergify mergify bot added the conflicts label Apr 27, 2025
Copy link
Contributor Author

mergify bot commented Apr 27, 2025

Cherry-pick of 8d1b99d has failed:

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

You are currently cherry-picking commit 8d1b99d.
  (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/Demos/Content-Filtering-Subscription.rst
	modified:   source/Tutorials/Demos/Intra-Process-Communication.rst
	modified:   source/Tutorials/Demos/Rosbag-with-ROS1-Bridge.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   source/Tutorials/Demos/Action-Introspection.rst
	both modified:   source/Tutorials/Demos/Logging-and-logger-configuration.rst
	both modified:   source/Tutorials/Demos/Quality-of-Service.rst
	both modified:   source/Tutorials/Demos/Real-Time-Programming.rst
	deleted by us:   source/Tutorials/Demos/Service-Introspection.rst
	both modified:   source/Tutorials/Demos/dummy-robot-demo.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/14694283993/artifacts/3017622006.

To view the resulting site:

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

@christophebedard christophebedard merged commit 870cdea into humble Apr 27, 2025
5 checks passed
@christophebedard christophebedard deleted the mergify/bp/humble/pr-5352 branch April 27, 2025 17:11
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