moveit2_tutorials icon indicating copy to clipboard operation
moveit2_tutorials copied to clipboard

Backport of Rename fake_components to mock_components (#470) to humble

Open mergify[bot] opened this issue 3 years ago • 2 comments

This is an automatic backport of pull request #470 done by Mergify. Cherry-pick of 215c7711fb568c9492515027c50f06dafa40ae10 has failed:

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

You are currently cherry-picking commit 215c771.
  (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:   moveit2_tutorials.repos

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda.ros2_control.xacro
	deleted by us:   doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda_hand.ros2_control.xacro

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

mergify[bot] avatar Jul 14 '22 18:07 mergify[bot]

The dual arm example should be backported first probably.

tylerjw avatar Jul 14 '22 19:07 tylerjw

Yeah, maybe merge this PR without dual arm stuff?

vatanaksoytezer avatar Jul 14 '22 19:07 vatanaksoytezer