resolve conflict#1004
Merged
fujitatomoya merged 2 commits intoros2:mergify/bp/galactic/pr-987from Sep 9, 2022
Merged
Conversation
Signed-off-by: Chen Lihui <lihui.chen@sony.com>
Contributor
Author
|
Could you help merge it? @fujitatomoya |
Signed-off-by: Chen Lihui <lihui.chen@sony.com>
fujitatomoya
approved these changes
Sep 9, 2022
fujitatomoya
pushed a commit
that referenced
this pull request
Sep 9, 2022
* support wildcard matching for params file (#987) * support regex for params file Signed-off-by: Chen Lihui <lihui.chen@sony.com> * add test Signed-off-by: Chen Lihui <lihui.chen@sony.com> * flake8 Signed-off-by: Chen Lihui <lihui.chen@sony.com> Signed-off-by: Chen Lihui <lihui.chen@sony.com> (cherry picked from commit 3586009) # Conflicts: # rclpy/src/rclpy/node.cpp * resolve conflict (#1004) * resolve conflict Signed-off-by: Chen Lihui <lihui.chen@sony.com> * cpp headers should be put after c Signed-off-by: Chen Lihui <lihui.chen@sony.com> Signed-off-by: Chen Lihui <lihui.chen@sony.com> * ament_cpplint recognizes headers with extensions in angle brackets as c system headers (#1005) excepts some headers defines in _CPP_HEADERS Signed-off-by: Chen Lihui <lihui.chen@sony.com> Signed-off-by: Chen Lihui <lihui.chen@sony.com> Signed-off-by: Chen Lihui <lihui.chen@sony.com> Co-authored-by: Chen Lihui <lihui.chen@sony.com>
tonynajjar
pushed a commit
to pixel-robotics/rclpy
that referenced
this pull request
Sep 10, 2022
) * support wildcard matching for params file (ros2#987) * support regex for params file Signed-off-by: Chen Lihui <lihui.chen@sony.com> * add test Signed-off-by: Chen Lihui <lihui.chen@sony.com> * flake8 Signed-off-by: Chen Lihui <lihui.chen@sony.com> Signed-off-by: Chen Lihui <lihui.chen@sony.com> (cherry picked from commit 3586009) # Conflicts: # rclpy/src/rclpy/node.cpp * resolve conflict (ros2#1004) * resolve conflict Signed-off-by: Chen Lihui <lihui.chen@sony.com> * cpp headers should be put after c Signed-off-by: Chen Lihui <lihui.chen@sony.com> Signed-off-by: Chen Lihui <lihui.chen@sony.com> * ament_cpplint recognizes headers with extensions in angle brackets as c system headers (ros2#1005) excepts some headers defines in _CPP_HEADERS Signed-off-by: Chen Lihui <lihui.chen@sony.com> Signed-off-by: Chen Lihui <lihui.chen@sony.com> Signed-off-by: Chen Lihui <lihui.chen@sony.com> Co-authored-by: Chen Lihui <lihui.chen@sony.com>
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
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.
related to #1003
Signed-off-by: Chen Lihui lihui.chen@sony.com