Closed mergify[bot] closed 1 month ago
Cherry-pick of 3be3fe95c3eb2a6a7e07bde2b96a9b8acc558d9a has failed:
On branch mergify/bp/humble/pr-1259
Your branch is up to date with 'origin/humble'.
You are currently cherry-picking commit 3be3fe9.
(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: rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py
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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Let's merge backport #1274 first
This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?
@mergifyio rebase
rebase
Attention: Patch coverage is 0%
with 2 lines
in your changes missing coverage. Please review.
Project coverage is 65.22%. Comparing base (
9e07ac5
) to head (98c5ccb
). Report is 1 commits behind head on humble.
Files with missing lines | Patch % | Lines |
---|---|---|
...ajectory_controller/joint_trajectory_controller.py | 0.00% | 2 Missing :warning: |
Hi,
When using the rqt_joint_trajectory_controller, not all the controllers are shown on the controller button. This is because the list of limits was not accumulated, and only the last one was considered. This PR fixes this, showing all the valid controllers.
I hope it helps Francisco
This is an automatic backport of pull request #1259 done by Mergify.