Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup Resource Manager a bit to increase clarity. (backport #816) #1191

Merged
merged 4 commits into from
Dec 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 4, 2023

This is an automatic backport of pull request #816 done by Mergify.
Cherry-pick of 88c74ae has failed:

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

You are currently cherry-picking commit 88c74ae.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 88c74ae)

# Conflicts:
#	hardware_interface/include/hardware_interface/resource_manager.hpp
#	hardware_interface/src/resource_manager.cpp
#	hardware_interface/test/mock_components/test_generic_system.cpp
#	hardware_interface/test/test_resource_manager.cpp
@christophfroehlich
Copy link
Contributor

Needs #837 first.

Copy link
Contributor Author

mergify bot commented Dec 10, 2023

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

@christophfroehlich
Copy link
Contributor

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Dec 10, 2023

rebase

☑️ Nothing to do

  • -conflict [:pushpin: rebase requirement]
  • -closed [:pushpin: rebase requirement]

Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff is smaller than the original PR, because some changes were already backported, e.g., with #1051

@bmagyar bmagyar merged commit 429820d into humble Dec 11, 2023
12 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-816 branch December 11, 2023 18:51
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