Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 18, 2025

Dear ros2_controllers maintainers, my previous pull request was taken down due to some issues. Because of the that issue I have to open a second pull request. I am deeply sorry for the inconvenience due to my error.

Furthermore, information related to this pull request are as following,

  1. Changed joint_reference_interfaces_ to reference_interface_name_ in 11 files with 31 additions and 31 deletions.

It passed following workflows,

  1. Check rolling compatibility on Jazzy
  2. Check rolling compatibility on Humble
  3. Check rolling compatibility on Kilted.

Again, I am extremely sorry for second pull request and your inconvenience.


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

(cherry picked from commit 6ddb0b4)

# Conflicts:
#	ackermann_steering_controller/test/test_ackermann_steering_controller.cpp
#	ackermann_steering_controller/test/test_ackermann_steering_controller.hpp
#	ackermann_steering_controller/test/test_ackermann_steering_controller_preceding.cpp
#	bicycle_steering_controller/test/test_bicycle_steering_controller.cpp
#	bicycle_steering_controller/test/test_bicycle_steering_controller.hpp
#	bicycle_steering_controller/test/test_bicycle_steering_controller_preceding.cpp
#	steering_controllers_library/test/test_steering_controllers_library.cpp
#	steering_controllers_library/test/test_steering_controllers_library.hpp
#	tricycle_steering_controller/test/test_tricycle_steering_controller.cpp
#	tricycle_steering_controller/test/test_tricycle_steering_controller.hpp
#	tricycle_steering_controller/test/test_tricycle_steering_controller_preceding.cpp
@mergify mergify bot added the conflicts label Nov 18, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 18, 2025

Cherry-pick of 6ddb0b4 has failed:

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

You are currently cherry-picking commit 6ddb0b4.
  (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:   ackermann_steering_controller/test/test_ackermann_steering_controller.cpp
	both modified:   ackermann_steering_controller/test/test_ackermann_steering_controller.hpp
	both modified:   ackermann_steering_controller/test/test_ackermann_steering_controller_preceding.cpp
	both modified:   bicycle_steering_controller/test/test_bicycle_steering_controller.cpp
	both modified:   bicycle_steering_controller/test/test_bicycle_steering_controller.hpp
	both modified:   bicycle_steering_controller/test/test_bicycle_steering_controller_preceding.cpp
	both modified:   steering_controllers_library/test/test_steering_controllers_library.cpp
	both modified:   steering_controllers_library/test/test_steering_controllers_library.hpp
	both modified:   tricycle_steering_controller/test/test_tricycle_steering_controller.cpp
	both modified:   tricycle_steering_controller/test/test_tricycle_steering_controller.hpp
	both modified:   tricycle_steering_controller/test/test_tricycle_steering_controller_preceding.cpp

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

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