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 enum naming for avoid collision (backport #242) #243

Merged
merged 3 commits into from
Feb 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 8, 2022

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

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

You are currently cherry-picking commit ce42968.
  (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:   rclc/src/rclc/executor_handle.c
	modified:   rclc/test/rclc/test_executor_handle.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclc/include/rclc/executor_handle.h
	both modified:   rclc/src/rclc/executor.c

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

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit ce42968)

# Conflicts:
#	rclc/include/rclc/executor_handle.h
#	rclc/src/rclc/executor.c
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9 pablogs9 removed the conflicts label Feb 8, 2022
@pablogs9 pablogs9 self-requested a review February 8, 2022 11:00
@pablogs9 pablogs9 merged commit 97d7ac8 into foxy Feb 8, 2022
@pablogs9 pablogs9 deleted the mergify/bp/foxy/pr-242 branch February 8, 2022 11:05
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.

None yet

1 participant