Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 9, 2023

This is an automatic backport of pull request #2335 done by Mergify.
Cherry-pick of f294488 has failed:

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

You are currently cherry-picking commit f294488e.
  (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/src/rclcpp/subscription_base.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclcpp/src/rclcpp/executor.cpp

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 refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will 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

* Disable the loaned messages inside the executor.

They are currently unsafe to use; see the comment in the
commit for more information.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit f294488)

# Conflicts:
#	rclcpp/src/rclcpp/executor.cpp
Signed-off-by: Chris Lalancette <clalancette@gmail.com>
@clalancette
Copy link
Contributor

CI for this is in ros2/rcl#1116 (comment)

@clalancette clalancette merged commit 24f059c into humble Nov 10, 2023
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-2335 branch November 10, 2023 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant