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

[JTC] Import docs from wiki.ros.org (backport #566) #634

Merged
merged 2 commits into from
May 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 31, 2023

This is an automatic backport of pull request #566 done by Mergify.
Cherry-pick of 6851df1 has failed:

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

You are currently cherry-picking commit 6851df1.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/doc/userdoc.rst

no changes added to commit (use "git add" and/or "git commit -a")

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

* Remove trajectory replacement doc from this PR

Co-authored-by: Dr. Denis <denis@stoglrobotics.de>
(cherry picked from commit 6851df1)

# Conflicts:
#	joint_trajectory_controller/doc/userdoc.rst
@destogl destogl merged commit c19c33c into humble May 31, 2023
11 of 12 checks passed
@destogl destogl deleted the mergify/bp/humble/pr-566 branch May 31, 2023 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants