Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 23, 2025

Refactored prepare_switch mechanism. This way it should be easier to understand and to extend.


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

Refactored prepare_switch mechanism. This way it should be easier to
understand and to extend.

(cherry picked from commit effc0a0)

# Conflicts:
#	ur_robot_driver/src/hardware_interface.cpp
@mergify
Copy link
Author

mergify bot commented Jun 23, 2025

Cherry-pick of effc0a0 has failed:

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

You are currently cherry-picking commit effc0a0.
  (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/include/ur_robot_driver/hardware_interface.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/src/hardware_interface.cpp

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 conflicts humble Relevant for humble and higher ROS versions labels Jun 23, 2025
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1417 branch from 62be83c to 786b888 Compare June 23, 2025 10:14
@urfeex urfeex merged commit 9ab47a1 into humble Jun 23, 2025
8 of 11 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1417 branch June 23, 2025 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts humble Relevant for humble and higher ROS versions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants