Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 21, 2025

PickNikRobotics/generate_parameter_library#91
Actually, I don't think this was needed at all here.


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

(cherry picked from commit ec198b1)

# Conflicts:
#	pid_controller/CMakeLists.txt
@mergify mergify bot added the conflicts label Nov 21, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 21, 2025

Cherry-pick of ec198b1 has failed:

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

You are currently cherry-picking commit ec198b1.
  (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:   pid_controller/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pid_controller/CMakeLists.txt

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
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Nov 22, 2025

rebase

✅ Nothing to do for rebase action

@christophfroehlich christophfroehlich merged commit 72cbca8 into humble Nov 22, 2025
12 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-2022 branch November 22, 2025 19:44
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