Skip to content

Update feature list (backport #1372) #1374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: humble
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 21, 2025

We have added a couple of cool features recently that we haven't added to the feature list.


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

* Update feature list

* Add references to feature list

(cherry picked from commit c8a44a6)

# Conflicts:
#	ur_robot_driver/doc/features.rst
@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels May 21, 2025
Copy link
Author

mergify bot commented May 21, 2025

Cherry-pick of c8a44a6 has failed:

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

You are currently cherry-picking commit c8a44a6.
  (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_calibration/doc/index.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/doc/features.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

@mergify mergify bot added the conflicts label May 21, 2025
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.

1 participant