Skip to content

Add support for UR15 (backport #97) #102

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.

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

Merged
merged 1 commit into from
May 21, 2025
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 21, 2025

Draft until description is merged for all relevant distros.


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

@mergify mergify bot added the conflicts label May 21, 2025
Copy link
Author

mergify bot commented May 21, 2025

Cherry-pick of 9dc25fb has failed:

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

You are currently cherry-picking commit 9dc25fb.
  (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

@mergify mergify bot mentioned this pull request May 21, 2025
@urfeex urfeex force-pushed the mergify/bp/humble/pr-97 branch from 70a6d16 to 1de5884 Compare May 21, 2025 07:03
@urfeex urfeex removed the conflicts label May 21, 2025
@urfeex urfeex merged commit 30cf180 into humble May 21, 2025
6 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-97 branch May 21, 2025 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant