fix: correct ASSERT_EQ to ASSERT_NE in admittance controller load test #2264
+72
−1
Mergify / Rule: Backport to humble at reviewers discretion (backport)
succeeded
May 1, 2026 in 0s
Backports have been created
- #2340 fix: correct ASSERT_EQ to ASSERT_NE in admittance controller load test (backport #2264) has been created for branch
humblebut encountered conflicts
Cherry-pick of b822e35 has failed:
On branch mergify/bp/humble/pr-2264
Your branch is up to date with 'origin/humble'.
You are currently cherry-picking commit b822e35.
(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: admittance_controller/test/test_params.yaml
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: admittance_controller/test/test_load_admittance_controller.cpp
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
Loading