Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jul 8, 2025

Fix time reference for force_mode_test


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

Wait for lookup before attempting it

(cherry picked from commit 0d5d77e)

# Conflicts:
#	ur_robot_driver/test/integration_test_force_mode.py
@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Jul 8, 2025
@mergify
Copy link
Author

mergify bot commented Jul 8, 2025

Cherry-pick of 0d5d77e has failed:

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

You are currently cherry-picking commit 0d5d77e.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/test/integration_test_force_mode.py

no changes added to commit (use "git add" and/or "git commit -a")

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 Jul 8, 2025
@urfeex urfeex removed the conflicts label Jul 8, 2025
@urfeex urfeex merged commit efd2e35 into humble Jul 8, 2025
7 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1429 branch July 8, 2025 08:58
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