-
Notifications
You must be signed in to change notification settings - Fork 336
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
Cleanup package.xml und clarify tests of JTC. (backport #889) #924
Conversation
Merge conflicts, backport #926 before? |
I don't think #926 applies to humble. Fixed the conflicts (I think) |
The title of 926 is "wrong", because the parameter validation got already backported with a different one. but the dependencies are missing on humble! |
You have added them now with this backport (which is fine, with 926 rsl and tl_expected will also be explicitly given in the CMakeLists) |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## humble #924 +/- ##
==========================================
+ Coverage 44.81% 44.84% +0.02%
==========================================
Files 40 40
Lines 3713 3713
Branches 1769 1769
==========================================
+ Hits 1664 1665 +1
Misses 835 835
+ Partials 1214 1213 -1
Flags with carried forward coverage won't be shown. Click here to find out more. |
* Cleanup package.xml und clarify tests of JTC. * Update joint_trajectory_controller/package.xml Co-authored-by: Bence Magyar <[email protected]> --------- Co-authored-by: Bence Magyar <[email protected]> (cherry picked from commit 1d0d753) # Conflicts: # joint_trajectory_controller/package.xml
be6810c
to
34e88e9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See commit above regarding backport of 926
This pull request is in conflict. Could you fix it @bmagyar @dstogl @christophfroehlich? |
This is an automatic backport of pull request #889 done by Mergify.
Cherry-pick of 1d0d753 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com