Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 28, 2025


This is an automatic backport of pull request #315 done by [Mergify](https://mergify.com).

* Fix max lenght in UDP port string

* Fix CI

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Update

* Linting

* Update

* Fix uncrustify

---------

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

# Conflicts:
#	.github/workflows/ci.yml
@mergify mergify bot added the conflicts label Feb 28, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Feb 28, 2025

Cherry-pick of aa15666 has failed:

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

You are currently cherry-picking commit aa15666.
  (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:   rmw_microxrcedds_c/include/rmw_microros/rmw_microros.h
	modified:   rmw_microxrcedds_c/src/rmw_graph.c
	modified:   rmw_microxrcedds_c/src/rmw_init.c
	modified:   rmw_microxrcedds_c/src/rmw_microros/init_options.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@pablogs9 pablogs9 merged commit c31887f into humble Feb 28, 2025
3 checks passed
@pablogs9 pablogs9 deleted the mergify/bp/humble/pr-315 branch February 28, 2025 07:47
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