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

Fix multiple calls to export reference interfaces (backport #1108) #1114

Merged
merged 2 commits into from
Sep 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 16, 2023

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

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

You are currently cherry-picking commit af10525.
  (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/src/controller_manager.cpp

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

# Conflicts:
#	controller_manager/test/test_controller_manager_srvs.cpp
Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

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

This should fix it

controller_manager/test/test_controller_manager_srvs.cpp Outdated Show resolved Hide resolved
Co-authored-by: Sai Kishor Kothakota <sai.kishor@pal-robotics.com>
@destogl destogl merged commit 1e73a8f into humble Sep 21, 2023
12 checks passed
@destogl destogl deleted the mergify/bp/humble/pr-1108 branch September 21, 2023 16:24
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.

2 participants