Open mergify[bot] opened 1 month ago
Cherry-pick of 62322b8fa74c90d144dfe32294f6670bf6cfe786 has failed:
On branch mergify/bp/humble/pr-646
Your branch is up to date with 'origin/humble'.
You are currently cherry-picking commit 62322b8f.
(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: tf2/src/buffer_core.cpp
modified: tf2_geometry_msgs/include/tf2_geometry_msgs/tf2_geometry_msgs.hpp
modified: tf2_geometry_msgs/test/test_tf2_geometry_msgs.cpp
modified: tf2_py/src/tf2_py.cpp
modified: tf2_py/test/test_buffer_core.py
modified: tf2_ros/CMakeLists.txt
new file: tf2_ros/test/velocity_test.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: tf2/include/tf2/buffer_core.h
both modified: tf2_ros/test/test_buffer.cpp
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
Related with this issue https://github.com/ros2/geometry2/issues/643
This is an automatic backport of pull request #646 done by Mergify.