Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 7, 2025

Focuses one of the points described here: #1676

Pretty much copied and adapted form diff drive controller. I've tested it on real robot and it worked fine


This is an automatic backport of pull request #1680 done by Mergify.

(cherry picked from commit 97dd175)

# Conflicts:
#	mecanum_drive_controller/src/mecanum_drive_controller.yaml
#	mecanum_drive_controller/test/test_mecanum_drive_controller.hpp
@mergify
Copy link
Contributor Author

mergify bot commented Jul 7, 2025

Cherry-pick of 97dd175 has failed:

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

You are currently cherry-picking commit 97dd175.
  (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:   mecanum_drive_controller/src/mecanum_drive_controller.cpp
	modified:   mecanum_drive_controller/test/mecanum_drive_controller_params.yaml
	modified:   mecanum_drive_controller/test/mecanum_drive_controller_preceding_params.yaml
	modified:   mecanum_drive_controller/test/test_mecanum_drive_controller.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mecanum_drive_controller/src/mecanum_drive_controller.yaml
	both modified:   mecanum_drive_controller/test/test_mecanum_drive_controller.hpp

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

@mergify mergify bot added the conflicts label Jul 7, 2025
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1680 branch July 7, 2025 09:43
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.

3 participants