Skip to content

Publish collision points for debug purposes (backport #3879)#3904

Closed
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-3879
Closed

Publish collision points for debug purposes (backport #3879)#3904
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-3879

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2023

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

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

You are currently cherry-picking commit c0fd78fc.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   nav2_collision_monitor/CMakeLists.txt
	deleted by us:   nav2_collision_monitor/include/nav2_collision_monitor/collision_detector_node.hpp
	both modified:   nav2_collision_monitor/include/nav2_collision_monitor/collision_monitor_node.hpp
	both modified:   nav2_collision_monitor/package.xml
	deleted by us:   nav2_collision_monitor/src/collision_detector_node.cpp
	both modified:   nav2_collision_monitor/src/collision_monitor_node.cpp
	deleted by us:   nav2_collision_monitor/test/collision_detector_node_test.cpp
	both modified:   nav2_collision_monitor/test/collision_monitor_node_test.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

* Rename PushRosNamespace to PushROSNamespace

* Fix min_points checking

* .

* fixes

* add to collision detector

* fix

* fix

* .

* fixes

* add namespace to topic

* fixes

(cherry picked from commit c0fd78f)

# Conflicts:
#	nav2_collision_monitor/CMakeLists.txt
#	nav2_collision_monitor/include/nav2_collision_monitor/collision_detector_node.hpp
#	nav2_collision_monitor/include/nav2_collision_monitor/collision_monitor_node.hpp
#	nav2_collision_monitor/package.xml
#	nav2_collision_monitor/src/collision_detector_node.cpp
#	nav2_collision_monitor/src/collision_monitor_node.cpp
#	nav2_collision_monitor/test/collision_detector_node_test.cpp
#	nav2_collision_monitor/test/collision_monitor_node_test.cpp
@mergify mergify bot added the conflicts label Oct 24, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 24, 2023

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

@mergify mergify bot deleted the mergify/bp/humble/pr-3879 branch October 24, 2023 18:09
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.

1 participant