Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 11, 2025

I tried browsing through the documentation trying to make it clear that PolyScope X is supported by this library.


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

(cherry picked from commit 6968ae0)

# Conflicts:
#	ur_robot_driver/package.xml
@mergify
Copy link
Author

mergify bot commented Nov 11, 2025

Cherry-pick of 6968ae0 has failed:

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

You are currently cherry-picking commit 6968ae0.
  (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:   README.md
	modified:   ur_calibration/package.xml
	modified:   ur_controllers/package.xml
	modified:   ur_dashboard_msgs/package.xml
	modified:   ur_moveit_config/package.xml
	modified:   ur_robot_driver/doc/usage/simulation.rst

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

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 added the documentation Improvements or additions to documentation label Nov 12, 2025
@urfeex urfeex removed the conflicts label Nov 12, 2025
@urfeex urfeex merged commit b046361 into jazzy Nov 12, 2025
4 of 6 checks passed
@urfeex urfeex deleted the mergify/bp/jazzy/pr-1563 branch November 12, 2025 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation Jazzy

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants