Resolve merge conflicts for mergify/bp/kilted/pr-1506 #1522
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Barry Xu <[email protected]>
fujitatomoya
approved these changes
Oct 12, 2025
fujitatomoya
pushed a commit
that referenced
this pull request
Oct 12, 2025
* Add content-filtered-topic interfaces (#1506) Signed-off-by: Barry Xu <[email protected]> (cherry picked from commit 8d42eaa) # Conflicts: # rclpy/rclpy/impl/_rclpy_pybind11.pyi # rclpy/rclpy/node.py # rclpy/src/rclpy/subscription.cpp # rclpy/src/rclpy/subscription.hpp # rclpy/test/test_subscription.py * Resolve merge conflicts (#1522) Signed-off-by: Barry Xu <[email protected]> --------- Signed-off-by: Barry Xu <[email protected]> Co-authored-by: Barry Xu <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Resolve merge conflicts #1520
Is this user-facing behavior change?
No
Did you use Generative AI?
No