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 Migrate CHOMP and collision tutorials from ROS1 (#492) to humble #742

Merged
merged 5 commits into from
Aug 10, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 10, 2023

This is an automatic backport of pull request #492 done by Mergify.
Cherry-pick of 725c7d8 has failed:

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

You are currently cherry-picking commit 725c7d8.
  (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/collision_environments/CMakeLists.txt
	deleted:    doc/examples/collision_environments/scripts/collision_scene_example.py
	new file:   doc/examples/collision_environments/src/collision_scene_example.cpp
	modified:   doc/examples/examples.rst
	new file:   doc/how_to_guides/chomp_planner/CMakeLists.txt
	renamed:    doc/examples/chomp_planner/chomp.png -> doc/how_to_guides/chomp_planner/chomp.png
	new file:   doc/how_to_guides/chomp_planner/chomp_planner_tutorial.rst
	new file:   doc/how_to_guides/chomp_planner/config/moveit_chomp.rviz
	new file:   doc/how_to_guides/chomp_planner/launch/chomp_demo.launch.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CMakeLists.txt
	deleted by them: doc/examples/chomp_planner/chomp_planner_tutorial.rst
	both modified:   doc/examples/planning_adapters/planning_adapters_tutorial.rst
	both modified:   doc/how_to_guides/how_to_guides.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 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

* Migrated tutorial from ROS1

* Fix merging error in CMakeLists.txt

---------

Co-authored-by: Henning Kayser <henningkayser@picknik.ai>
Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
(cherry picked from commit 725c7d8)

# Conflicts:
#	CMakeLists.txt
#	doc/examples/chomp_planner/chomp_planner_tutorial.rst
#	doc/examples/planning_adapters/planning_adapters_tutorial.rst
#	doc/how_to_guides/how_to_guides.rst
@mergify mergify bot added conflicts humble Humble branch labels Aug 10, 2023
@sjahr sjahr merged commit 1926dab into humble Aug 10, 2023
8 checks passed
@sjahr sjahr deleted the mergify/bp/humble/pr-492 branch August 10, 2023 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Humble branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants