Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 10, 2023

This is an automatic backport of pull request #341 done by Mergify.
Cherry-pick of 810afe1 has failed:

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

You are currently cherry-picking commit 810afe1.
  (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_examples/src/example_client_node.c
	modified:   rclc_examples/src/example_executor.c
	modified:   rclc_examples/src/example_executor_only_rcl.c
	modified:   rclc_examples/src/example_executor_trigger.c
	modified:   rclc_examples/src/example_parameter_server.c
	modified:   rclc_examples/src/example_service_node.c
	modified:   rclc_examples/src/example_short_timer_long_subscription.c
	modified:   rclc_examples/src/example_sub_context.c

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   rclc_examples/src/example_action_client.c
	deleted by us:   rclc_examples/src/example_action_server.c
	both modified:   rclc_examples/src/example_lifecycle_node.c
	both modified:   rclc_examples/src/example_pingpong.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

* added documentation about number_of_handles in all examples.

Signed-off-by: Jan Staschulat <[email protected]>

* aligned prepare() and spin() in all functions

Signed-off-by: Jan Staschulat <[email protected]>

* removed 'prepare' functions - to make it easier for beginners.

Signed-off-by: Jan Staschulat <[email protected]>

---------

Signed-off-by: Jan Staschulat <[email protected]>
(cherry picked from commit 810afe1)

# Conflicts:
#	rclc_examples/src/example_action_client.c
#	rclc_examples/src/example_action_server.c
#	rclc_examples/src/example_lifecycle_node.c
#	rclc_examples/src/example_pingpong.cpp
Signed-off-by: Jan Staschulat <[email protected]>
@JanStaschulat JanStaschulat merged commit eebb03b into foxy Mar 31, 2023
@JanStaschulat JanStaschulat deleted the mergify/bp/foxy/pr-341 branch March 31, 2023 14:31
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