Skip to content
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

Backport of Fix CI (#826) to humble #827

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 1, 2023

This is an automatic backport of pull request #826 done by Mergify.
Cherry-pick of b2cd6c0 has failed:

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

You are currently cherry-picking commit b2cd6c0.
  (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:   doc/examples/planning_adapters/planning_adapters_tutorial.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/upstream.repos
	both modified:   moveit2_tutorials.repos

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Add ros2 kortex to upstream repos

* Update to commit with planning pipeline refactor change

* Add ros2_robotiq_gripper repo for source build

* Add serial to .repos file

* Add ros2_robotiq_gripper to moveit2_tutorials.repo

* Remove dead link

(cherry picked from commit b2cd6c0)

# Conflicts:
#	.github/upstream.repos
#	moveit2_tutorials.repos
@mergify mergify bot added conflicts humble Humble branch labels Dec 1, 2023
@sjahr sjahr linked an issue Dec 1, 2023 that may be closed by this pull request
@sjahr
Copy link
Contributor

sjahr commented Dec 1, 2023

Nope, humble does not use the kinova arm

@sjahr sjahr closed this Dec 1, 2023
@mergify mergify bot deleted the mergify/bp/humble/pr-826 branch December 1, 2023 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts humble Humble branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants