moveit2_tutorials
moveit2_tutorials copied to clipboard
Backport of Remove recommendation for Cyclone due to FastDDS issues (#799) to humble
This is an automatic backport of pull request #799 done by Mergify. Cherry-pick of 71ee840a50794bbfd35e5b63e80fc633d89840ed has failed:
On branch mergify/bp/humble/pr-799
Your branch is up to date with 'origin/humble'.
You are currently cherry-picking commit 71ee840.
(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: .docker/Dockerfile
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: doc/tutorials/getting_started/getting_started.rst
both modified: doc/tutorials/quickstart_in_rviz/quickstart_in_rviz_tutorial.rst
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill 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
This pull request is in conflict. Could you fix it @mergify[bot]?