Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 8, 2024

This basically implements a service for ros-industrial/ur_msgs#30


This is an automatic backport of pull request #1123 done by Mergify.

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Oct 8, 2024
@mergify
Copy link
Author

mergify bot commented Oct 8, 2024

Cherry-pick of 8f2dfa9 has failed:

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

You are currently cherry-picking commit 8f2dfa9.
  (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:   ur_controllers/include/ur_controllers/gpio_controller.hpp
	modified:   ur_controllers/src/gpio_controller.cpp
	modified:   ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
	modified:   ur_robot_driver/src/hardware_interface.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ur_controllers/doc/index.rst
	deleted by us:   ur_robot_driver/urdf/ur.ros2_control.xacro

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed for humble the necessary ros2_control xacro changes need to go to the description.

@fmauch fmauch removed the conflicts label Oct 26, 2024
@fmauch fmauch force-pushed the mergify/bp/humble/pr-1123 branch from f447464 to 5d23f0c Compare October 26, 2024 20:32
Felix Exner (fexner) added 2 commits October 28, 2024 13:51
(cherry picked from commit 8f2dfa9)

# Conflicts:
#	ur_controllers/doc/index.rst
#	ur_robot_driver/urdf/ur.ros2_control.xacro
@fmauch fmauch force-pushed the mergify/bp/humble/pr-1123 branch from 5d23f0c to f215eaf Compare October 28, 2024 12:51
Copy link
Contributor

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified that this also works on Humble.

@fmauch fmauch merged commit 88275cc into humble Oct 28, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-1123 branch October 28, 2024 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

humble Relevant for humble and higher ROS versions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant