Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 17, 2025

ros-controls/realtime_tools#347


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

Co-authored-by: Sai Kishor Kothakota <saisastra3@gmail.com>
(cherry picked from commit 4a64d8f)

# Conflicts:
#	control_toolbox/include/control_toolbox/pid.hpp
@mergify mergify bot added the conflicts label Jun 17, 2025
@mergify
Copy link
Author

mergify bot commented Jun 17, 2025

Cherry-pick of 4a64d8f has failed:

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

You are currently cherry-picking commit 4a64d8f.
  (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:   control_toolbox/include/control_toolbox/pid_ros.hpp
	modified:   control_toolbox/src/pid.cpp
	modified:   control_toolbox/src/pid_ros.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   control_toolbox/include/control_toolbox/pid.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

@christophfroehlich christophfroehlich merged commit 1640afa into jazzy Jun 18, 2025
9 of 11 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/jazzy/pr-387 branch June 18, 2025 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants