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

fake_sensor_commands renamed (backport #782) #835

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2022

This is an automatic backport of pull request #782 done by Mergify.
Cherry-pick of 1cf9bf2 has failed:

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

You are currently cherry-picking commit 1cf9bf2.
  (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:   hardware_interface/doc/mock_components_userdoc.rst
	modified:   hardware_interface/include/mock_components/generic_system.hpp
	modified:   hardware_interface/src/mock_components/generic_system.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hardware_interface/test/mock_components/test_generic_system.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

…ds' (#782)

Co-authored-by: Bence Magyar <[email protected]>
Co-authored-by: Denis Štogl <[email protected]>
(cherry picked from commit 1cf9bf2)

# Conflicts:
#	hardware_interface/test/mock_components/test_generic_system.cpp
@bmagyar bmagyar added the humble label Dec 6, 2022
@destogl
Copy link
Member

destogl commented Mar 13, 2023

This should probably be deprecated because of user-level parameter rename – so we should have both options and give a warning.

@mergify
Copy link
Contributor Author

mergify bot commented Jun 14, 2023

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

@christophfroehlich
Copy link
Contributor

This is obsolete because all changes got merged with #1051 (zero diff after merging humble into it).

@mergify mergify bot deleted the mergify/bp/humble/pr-782 branch December 3, 2023 21:58
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.

4 participants