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] Fix typos, implicit cast, const member functions (backport #748) #749

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2023

This is an automatic backport of pull request #748 done by Mergify.
Cherry-pick of 6b73cf5 has failed:

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

You are currently cherry-picking commit 6b73cf5.
  (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:   joint_trajectory_controller/src/joint_trajectory_controller_parameters.yaml
	modified:   joint_trajectory_controller/test/test_trajectory_controller.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
	both modified:   joint_trajectory_controller/src/joint_trajectory_controller.cpp
	both modified:   joint_trajectory_controller/test/test_trajectory_controller_utils.hpp

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 6b73cf5)

# Conflicts:
#	joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
#	joint_trajectory_controller/src/joint_trajectory_controller.cpp
#	joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
@mergify mergify bot added the conflicts label Aug 16, 2023
@christophfroehlich christophfroehlich added the hold Holding off merging this PR until some condition label Aug 16, 2023
@christophfroehlich
Copy link
Contributor

included in #801

@mergify mergify bot deleted the mergify/bp/humble/pr-748 branch October 21, 2023 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts hold Holding off merging this PR until some condition
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant