Skip to content

[JTC] Activate checks for parameter validation (backport #857)#872

Closed
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-857
Closed

[JTC] Activate checks for parameter validation (backport #857)#872
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-857

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Nov 30, 2023

This is an automatic backport of pull request #857 done by Mergify.
Cherry-pick of fcc0847 has failed:

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

You are currently cherry-picking commit fcc0847.
  (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/test/test_trajectory_controller.cpp
	both modified:   joint_trajectory_controller/test/test_trajectory_controller_utils.hpp

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

(cherry picked from commit fcc0847)

# Conflicts:
#	joint_trajectory_controller/test/test_trajectory_controller.cpp
#	joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
@mergify mergify bot added the conflicts label Nov 30, 2023
@christophfroehlich
Copy link
Copy Markdown
Member

Included in #801

@mergify mergify bot deleted the mergify/bp/humble/pr-857 branch November 30, 2023 20:28
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.

1 participant