Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 8, 2025

Description

Related to ros2/rclcpp#2975, ConstSharedPtr is preferred

Did you use Generative AI?

No

Additional Information


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

Signed-off-by: Maurice <[email protected]>
(cherry picked from commit bf46139)

# Conflicts:
#	source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst
#	source/Tutorials/Advanced/Simulators/Webots/Code/MyRobotDriver.cpp
#	source/Tutorials/Advanced/Simulators/Webots/Code/ObstacleAvoider.cpp
#	source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Cpp.rst
@mergify mergify bot added the conflicts label Dec 8, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Dec 8, 2025

Cherry-pick of bf46139 has failed:

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

You are currently cherry-picking commit bf46139.
  (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/Advanced/Simulators/Webots/Code/ObstacleAvoider.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst
	both modified:   source/Tutorials/Advanced/Simulators/Webots/Code/MyRobotDriver.cpp
	both modified:   source/Tutorials/Advanced/Simulators/Webots/Code/ObstacleAvoider.cpp
	both modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-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

Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

@mini-1235 Do you mind to take a look to the conflicts?

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.

3 participants