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

You are currently cherry-picking commit 22df1d59.
  (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:   rclcpp_lifecycle/test/test_lifecycle_publisher.cpp

no changes added to commit (use "git add" and/or "git commit -a")