Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2023

This is an automatic backport of pull request #1046 done by Mergify.
Cherry-pick of cf4448d has failed:

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

You are currently cherry-picking commit cf4448d.
  (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:   controller_manager/doc/userdoc.rst
	modified:   controller_manager/test/test_hardware_management_srvs.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/src/controller_manager.cpp
	both modified:   hardware_interface/include/hardware_interface/resource_manager.hpp
	both modified:   hardware_interface/src/resource_manager.cpp

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> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit cf4448d)

# Conflicts:
#	controller_manager/src/controller_manager.cpp
#	hardware_interface/include/hardware_interface/resource_manager.hpp
#	hardware_interface/src/resource_manager.cpp
@bmagyar
Copy link
Member

bmagyar commented Jun 23, 2023

@destogl should we fix this or no backport?

@destogl
Copy link
Member

destogl commented Jun 26, 2023

We should fix this, but first merge #1052

@christophfroehlich
Copy link
Contributor

christophfroehlich commented Dec 10, 2023

needs #1216 first

@christophfroehlich christophfroehlich marked this pull request as draft December 10, 2023 22:02
@mergify
Copy link
Contributor Author

mergify bot commented Dec 11, 2023

This pull request is in conflict. Could you fix it @mergify[bot]?

@destogl destogl marked this pull request as ready for review January 12, 2024 17:58
@christophfroehlich
Copy link
Contributor

@destogl I fixed this PR. ABI check fails, but this is only because of the test files? Shouldn't break anything from users?

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.

5 participants