Skip to content

Conversation

mergify[bot]
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 #118 done by Mergify.

(cherry picked from commit afc7048)

# Conflicts:
#	ur_simulation_gz/test/test_description.py
#	ur_simulation_gz/urdf/ur_gz.urdf.xacro
Copy link
Author

mergify bot commented Oct 10, 2025

Cherry-pick of afc7048 has failed:

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

You are currently cherry-picking commit afc7048.
  (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_simulation_gz/launch/ur_sim_control.launch.py
	modified:   ur_simulation_gz/launch/ur_sim_moveit.launch.py
	modified:   ur_simulation_gz/test/test_gz.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ur_simulation_gz/test/test_description.py
	deleted by us:   ur_simulation_gz/urdf/ur_gz.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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant