Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merge conflicts #1939

Merged
merged 1 commit into from
May 21, 2022
Merged

Fix merge conflicts #1939

merged 1 commit into from
May 21, 2022

Conversation

Barry-Xu-2018
Copy link
Collaborator

@Barry-Xu-2018 Barry-Xu-2018 commented May 21, 2022 •
edited
Loading

Address merge issue #1394

@Barry-Xu-2018
Fix merge conflicts
09c55d6 
Signed-off-by: Barry Xu <barry.xu@sony.com>
@Barry-Xu-2018
Copy link
Collaborator Author

@fujitatomoya

Please help to review

@Barry-Xu-2018 Barry-Xu-2018 mentioned this pull request May 21, 2022
Merged
@fujitatomoya
Copy link
Collaborator

I will go ahead to merge this for staging PR.

@fujitatomoya fujitatomoya merged commit b678183 into ros2:mergify/bp/foxy/pr-1927 May 21, 2022
fujitatomoya pushed a commit that referenced this pull request Jun 9, 2022
@mergify
Add statistics for handle_loaned_message (backport #1927) (#1934)
48ec78c 
* Add statistics for handle_loaned_message (#1927)

Signed-off-by: Barry Xu <barry.xu@sony.com>
(cherry picked from commit 5c68830)

# Conflicts:
#	rclcpp/include/rclcpp/subscription.hpp

* Fix merge conflicts (#1939)

Signed-off-by: Barry Xu <barry.xu@sony.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fujitatomoya fujitatomoya fujitatomoya approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Barry-Xu-2018 @fujitatomoya