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

You are currently cherry-picking commit 16cc8a2.
  (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:   test_tf2/test/buffer_core_test.cpp
	modified:   test_tf2/test/test_buffer_client.cpp
	modified:   test_tf2/test/test_buffer_server.cpp
	modified:   test_tf2/test/test_message_filter.cpp
	modified:   test_tf2/test/test_static_publisher.cpp
	modified:   test_tf2/test/test_tf2_bullet.cpp
	modified:   tf2_bullet/include/tf2_bullet/tf2_bullet.hpp
	modified:   tf2_eigen/include/tf2_eigen/tf2_eigen.hpp
	modified:   tf2_eigen/test/tf2_eigen-test.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_kdl/include/tf2_kdl/tf2_kdl.hpp
	modified:   tf2_kdl/test/test_tf2_kdl.cpp
	modified:   tf2_ros/include/tf2_ros/async_buffer_interface.h
	new file:   tf2_ros/include/tf2_ros/async_buffer_interface.hpp
	new file:   tf2_ros/include/tf2_ros/buffer.hpp
	modified:   tf2_ros/include/tf2_ros/buffer_client.h
	new file:   tf2_ros/include/tf2_ros/buffer_client.hpp
	modified:   tf2_ros/include/tf2_ros/buffer_interface.h
	new file:   tf2_ros/include/tf2_ros/buffer_interface.hpp
	modified:   tf2_ros/include/tf2_ros/buffer_server.h
	new file:   tf2_ros/include/tf2_ros/buffer_server.hpp
	modified:   tf2_ros/include/tf2_ros/create_timer_interface.h
	new file:   tf2_ros/include/tf2_ros/create_timer_interface.hpp
	modified:   tf2_ros/include/tf2_ros/create_timer_ros.h
	new file:   tf2_ros/include/tf2_ros/create_timer_ros.hpp
	new file:   tf2_ros/include/tf2_ros/message_filter.hpp
	modified:   tf2_ros/include/tf2_ros/qos.hpp
	new file:   tf2_ros/include/tf2_ros/static_transform_broadcaster.hpp
	modified:   tf2_ros/include/tf2_ros/static_transform_broadcaster_node.hpp
	modified:   tf2_ros/include/tf2_ros/static_transform_broadcaster_visibility_control.h
	new file:   tf2_ros/include/tf2_ros/static_transform_broadcaster_visibility_control.hpp
	new file:   tf2_ros/include/tf2_ros/transform_broadcaster.hpp
	new file:   tf2_ros/include/tf2_ros/transform_listener.hpp
	modified:   tf2_ros/include/tf2_ros/visibility_control.h
	new file:   tf2_ros/include/tf2_ros/visibility_control.hpp
	modified:   tf2_ros/src/buffer.cpp
	modified:   tf2_ros/src/buffer_client.cpp
	modified:   tf2_ros/src/buffer_server.cpp
	modified:   tf2_ros/src/buffer_server_main.cpp
	modified:   tf2_ros/src/create_timer_ros.cpp
	modified:   tf2_ros/src/static_transform_broadcaster.cpp
	modified:   tf2_ros/src/tf2_echo.cpp
	modified:   tf2_ros/src/tf2_monitor.cpp
	modified:   tf2_ros/src/transform_broadcaster.cpp
	modified:   tf2_ros/src/transform_listener.cpp
	modified:   tf2_ros/test/listener_unittest.cpp
	modified:   tf2_ros/test/message_filter_test.cpp
	modified:   tf2_ros/test/test_buffer.cpp
	modified:   tf2_ros/test/test_buffer_client.cpp
	modified:   tf2_ros/test/test_buffer_server.cpp
	modified:   tf2_ros/test/test_static_transform_broadcaster.cpp
	modified:   tf2_ros/test/test_transform_broadcaster.cpp
	modified:   tf2_ros/test/test_transform_listener.cpp
	modified:   tf2_ros/test/time_reset_test.cpp
	modified:   tf2_ros/test/velocity_test.cpp
	modified:   tf2_sensor_msgs/include/tf2_sensor_msgs/tf2_sensor_msgs.hpp
	modified:   tf2_sensor_msgs/test/test_tf2_sensor_msgs.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tf2_ros/include/tf2_ros/buffer.h
	both modified:   tf2_ros/include/tf2_ros/message_filter.h
	both modified:   tf2_ros/include/tf2_ros/static_transform_broadcaster.h
	both modified:   tf2_ros/include/tf2_ros/transform_broadcaster.h
	both modified:   tf2_ros/include/tf2_ros/transform_listener.h