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 place pose generation IK frame in MTC Tutorial (#727) to humble #735

Merged
merged 2 commits into from
Aug 8, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 8, 2023

This is an automatic backport of pull request #727 done by Mergify.
Cherry-pick of 35048cb has failed:

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

You are currently cherry-picking commit 35048cb.
  (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/tutorials/pick_and_place_with_moveit_task_constructor/src/mtc_node.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/tutorials/pick_and_place_with_moveit_task_constructor/pick_and_place_with_moveit_task_constructor.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

(cherry picked from commit 35048cb)

# Conflicts:
#	doc/tutorials/pick_and_place_with_moveit_task_constructor/pick_and_place_with_moveit_task_constructor.rst
@mergify mergify bot added conflicts humble Humble branch labels Aug 8, 2023
Copy link
Contributor

@sea-bass sea-bass left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The htmlproofer link errors are related to servo updates and we'll handle those separately.

EDIT: Fixed in #738

@sea-bass sea-bass merged commit 439debd into humble Aug 8, 2023
8 checks passed
@sea-bass sea-bass deleted the mergify/bp/humble/pr-727 branch August 8, 2023 16:29
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.

1 participant