Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 4, 2025

The respective URCap installation setup got merged into the robot_setup in the client_library's documentation.


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

The respective URCap installation setup got merged into the robot_setup
in the client_library's documentation.

(cherry picked from commit d7f3ea7)

# Conflicts:
#	README.md
@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Feb 4, 2025
@mergify
Copy link
Author

mergify bot commented Feb 4, 2025

Cherry-pick of d7f3ea7 has failed:

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

You are currently cherry-picking commit d7f3ea7.
  (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:   README.md

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

@urfeex
Copy link
Member

urfeex commented Feb 4, 2025

The Humble README actually points to the Humble docs, which are still structured with the separated instructions, hence closing this.

@urfeex urfeex closed this Feb 4, 2025
@urfeex urfeex deleted the mergify/bp/humble/pr-1263 branch February 4, 2025 08:52
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