Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Sep 17, 2025


This is an automatic backport of pull request #111 done by [Mergify](https://mergify.com).

@mergify
Copy link
Author

mergify bot commented Sep 17, 2025

Cherry-pick of 29cb4f0 has failed:

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

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

@urfeex urfeex force-pushed the mergify/bp/humble/pr-111 branch from 4da2915 to 5ac1d18 Compare September 17, 2025 08:15
@urfeex urfeex removed the conflicts label Sep 17, 2025
@urfeex urfeex merged commit 171193b into humble Sep 17, 2025
6 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-111 branch September 17, 2025 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants