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

You are currently cherry-picking commit 64e4c72.
  (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:   rclcpp/include/rclcpp/create_service.hpp
	modified:   rclcpp/include/rclcpp/node.hpp
	modified:   rclcpp/include/rclcpp/node_impl.hpp
	modified:   rclcpp/test/rclcpp/strategies/test_allocator_memory_strategy.cpp
	modified:   rclcpp/test/rclcpp/test_client.cpp
	modified:   rclcpp/test/rclcpp/test_memory_strategy.cpp
	modified:   rclcpp/test/rclcpp/test_service.cpp
	modified:   rclcpp_lifecycle/include/rclcpp_lifecycle/lifecycle_node.hpp
	modified:   rclcpp_lifecycle/include/rclcpp_lifecycle/lifecycle_node_impl.hpp
	new file:   rclcpp_lifecycle/test/test_service.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclcpp_lifecycle/CMakeLists.txt