ros2_controllers
ros2_controllers copied to clipboard
[JTC] Implement effort-only command interface (backport #225)
This is an automatic backport of pull request #225 done by Mergify. Cherry-pick of 97c94316fe9c406cf21e493cd3c58d4c1c3fd533 has failed:
On branch mergify/bp/galactic/pr-225
Your branch is up to date with 'origin/galactic'.
You are currently cherry-picking commit 97c9431.
(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: joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: joint_trajectory_controller/src/joint_trajectory_controller.cpp
both modified: joint_trajectory_controller/test/test_trajectory_controller.cpp
both modified: joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branch
Additionally, on Mergify dashboard you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com