Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 26, 2025


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

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>
(cherry picked from commit 40a0451)

# Conflicts:
#	nav2_collision_monitor/src/pointcloud.cpp
@mergify mergify bot added the conflicts label Jul 26, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jul 26, 2025

Cherry-pick of 40a0451 has failed:

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

You are currently cherry-picking commit 40a04517.
  (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:   nav2_collision_monitor/include/nav2_collision_monitor/pointcloud.hpp
	modified:   nav2_collision_monitor/test/sources_test.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nav2_collision_monitor/src/pointcloud.cpp

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

@mergify
Copy link
Contributor Author

mergify bot commented Jul 26, 2025

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @kilted, but it must be in main
to have these changes reflected into new distributions.

Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
@SteveMacenski SteveMacenski merged commit 06081c3 into kilted Jul 28, 2025
11 of 12 checks passed
@SteveMacenski SteveMacenski deleted the mergify/bp/kilted/pr-5392 branch July 28, 2025 00:25
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