Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 10, 2025

This requires UniversalRobots/Universal_Robots_ROS2_Description#340.


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

@mergify
Copy link
Author

mergify bot commented Oct 10, 2025

Cherry-pick of 233d524 has failed:

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

You are currently cherry-picking commit 233d524.
  (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:   README.md
	new file:   ur_robot_driver/config/ur18_update_rate.yaml
	modified:   ur_robot_driver/doc/usage/startup.rst
	new file:   ur_robot_driver/launch/ur18.launch.py
	modified:   ur_robot_driver/launch/ur_control.launch.py
	modified:   ur_robot_driver/test/test_common.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ur_moveit_config/launch/ur_moveit.launch.py
	deleted by us:   ur_robot_driver/launch/ur_rsp.launch.py
	deleted by us:   ur_robot_driver/urdf/ur.urdf.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

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Oct 10, 2025
(cherry picked from commit 233d524)

# Conflicts:
#	ur_moveit_config/launch/ur_moveit.launch.py
#	ur_robot_driver/launch/ur_rsp.launch.py
#	ur_robot_driver/urdf/ur.urdf.xacro
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1524 branch from a26d149 to d0c72cd Compare October 22, 2025 12:58
@urfeex urfeex removed the conflicts label Oct 22, 2025
@urfeex urfeex merged commit b73c919 into humble Oct 22, 2025
8 of 9 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1524 branch October 22, 2025 14:02
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