moveit2_tutorials
moveit2_tutorials copied to clipboard
Bulk rename ws_moveit2 --> ws_moveit (backport #411)
This is an automatic backport of pull request #411 done by Mergify. Cherry-pick of 4c408fbe0218c6bf4062c4dc090b8e8c8c3062bd has failed:
On branch mergify/bp/galactic/pr-411
Your branch is up to date with 'origin/galactic'.
You are currently cherry-picking commit 4c408fb.
(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/mobile_base_arm/mobile_base_arm_tutorial.rst
modified: doc/how_to_contribute/how_to_contribute_to_site.rst
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: doc/tutorials/getting_started/getting_started.rst
deleted by us: doc/tutorials/pick_and_place_with_moveit_task_constructor/pick_and_place_with_moveit_task_constructor.rst
deleted by us: doc/tutorials/visualizing_in_rviz/visualizing_in_rviz.rst
deleted by us: doc/tutorials/your_first_project/your_first_project.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]?