Solve conflicts on ros2/rosidl#867 #868
Merged
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: Michel Hidalgo <michel@ekumenlabs.com>
hidmic
changed the title
hidmic
changed the title
Contributor
fujitatomoya
left a comment
fujitatomoya
left a comment
There was a problem hiding this comment.
@hidmic thanks for the quick response! i will just go ahead to merge this and start CI to see if that is okay.
fujitatomoya
pushed a commit
that referenced
this pull request
May 15, 2025
* rosidl_cli: Add type description support (#857) * Add type description support to rosidl_cli Signed-off-by: Francisco Rossi <frossi@ekumenlabs.com> * Fix typing annotation Signed-off-by: Francisco Rossi <frossi@ekumenlabs.com> * Please flake8, mypy Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com> * Please flake8 take 2 Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com> --------- Signed-off-by: Francisco Rossi <frossi@ekumenlabs.com> Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Christophe Bedard <bedard.christophe@gmail.com> (cherry picked from commit c9a3084) # Conflicts: # rosidl_cli/rosidl_cli/cli.py # rosidl_cli/rosidl_cli/command/generate/api.py # rosidl_cli/rosidl_cli/command/generate/extensions.py # rosidl_cli/rosidl_cli/command/helpers.py * Solve conflicts (#868) Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com> * Please flake8 (#870) Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com> --------- Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com> Co-authored-by: Francisco Rossi <50388097+frneer@users.noreply.github.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>
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.
Precisely what the title says.