Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2023

This is an automatic backport of pull request #941 done by Mergify.
Cherry-pick of 937817c has failed:

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

You are currently cherry-picking commit 937817c.
  (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:
	new file:   controller_manager/controller_manager/hardware_spawner.py
	modified:   controller_manager/setup.cfg
	modified:   controller_manager/src/controller_manager.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/controller_manager/__init__.py
	both modified:   controller_manager/controller_manager/controller_manager_services.py

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

@mergify mergify bot added the conflicts label Dec 12, 2023
@mergify mergify bot mentioned this pull request Dec 12, 2023
destogl
destogl previously approved these changes Dec 12, 2023
@christophfroehlich
Copy link
Contributor

@destogl You reverted the deprecation warnings, should we then merge the backport of #1064 at all? Or just support both versions, without deprecating the old one?

@christophfroehlich
Copy link
Contributor

@destogl You reverted the deprecation warnings, should we then merge the backport of #1064 at all? Or just support both versions, without deprecating the old one?

We decided to revert the last commit and backport #1064

mamueluth and others added 4 commits January 12, 2024 16:35
* add spwaner for hardware

* aplly suggestions from code review

* move comment

(cherry picked from commit 937817c)

# Conflicts:
#	controller_manager/controller_manager/__init__.py
#	controller_manager/controller_manager/controller_manager_services.py
@destogl destogl merged commit 506887f into humble Jan 12, 2024
@destogl destogl deleted the mergify/bp/humble/pr-941 branch January 12, 2024 17:36
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.

4 participants