Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 6, 2025

Otherwise initial controller switches may fail


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

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

mergify bot commented Oct 6, 2025

Cherry-pick of bcbcac7 has failed:

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

You are currently cherry-picking commit bcbcac7.
  (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_robot_driver/test/integration_test_force_mode.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ur_robot_driver/test/integration_test_passthrough_controller.py
	deleted by us:   ur_robot_driver/test/integration_test_scaled_joint_controller.py

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 the conflicts label Oct 6, 2025
* Wait for used controllers in test setup

Otherwise initial controller switches may fail

* Fix typo

(cherry picked from commit bcbcac7)
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1519 branch from 44cb860 to f9916da Compare October 13, 2025 10:35
@urfeex urfeex removed the conflicts label Oct 13, 2025
@urfeex urfeex merged commit 4008da7 into humble Oct 13, 2025
5 of 7 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1519 branch October 13, 2025 12:18
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