Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 26, 2025

This will fix #1195


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

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

mergify bot commented Jun 26, 2025

Cherry-pick of 868f240 has failed:

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

You are currently cherry-picking commit 868f240.
  (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_dashboard_msgs/CMakeLists.txt
	new file:   ur_dashboard_msgs/srv/IsInRemoteControl.srv
	modified:   ur_robot_driver/include/ur_robot_driver/dashboard_client_ros.hpp
	modified:   ur_robot_driver/src/dashboard_client_ros.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ur_robot_driver/doc/dashboard_client.rst

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-1433 branch from fc671a2 to 05aac07 Compare June 26, 2025 10:41
@urfeex urfeex removed the conflicts label Jun 26, 2025
@urfeex urfeex merged commit 61fbe82 into humble Jun 26, 2025
7 of 9 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1433 branch June 26, 2025 18:23
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.

2 participants