Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 27, 2025

Related to ros-navigation/navigation2#5288


This is an automatic backport of pull request #44 done by Mergify.

(cherry picked from commit 443563f)

# Conflicts:
#	nav2_frenet_ilqr_controller/CMakeLists.txt
#	nav2_frenet_ilqr_controller/src/frenet_ilqr_controller.cpp
#	nav2_frenet_ilqr_controller/src/path_handler.cpp
@mergify mergify bot added the conflicts label Oct 27, 2025
@mergify
Copy link
Author

mergify bot commented Oct 27, 2025

Cherry-pick of 443563f has failed:

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

You are currently cherry-picking commit 443563f.
  (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_frenet_ilqr_controller/include/nav2_frenet_ilqr_controller/costs/lateral_distance_cost.hpp
	modified:   nav2_frenet_ilqr_controller/include/nav2_frenet_ilqr_controller/costs/longtitutal_velocity_cost.hpp
	modified:   nav2_frenet_ilqr_controller/include/nav2_frenet_ilqr_controller/costs/obstacle_cost.hpp
	modified:   nav2_frenet_ilqr_controller/include/nav2_frenet_ilqr_controller/costs/rclcpp_node_cost.hpp
	modified:   nav2_frenet_ilqr_controller/include/nav2_frenet_ilqr_controller/frenet_ilqr_controller.hpp
	modified:   nav2_frenet_ilqr_controller/include/nav2_frenet_ilqr_controller/parameter_handler.hpp
	modified:   nav2_frenet_ilqr_controller/include/nav2_frenet_ilqr_controller/policies/obstacle_policy.hpp
	modified:   nav2_frenet_ilqr_controller/include/nav2_frenet_ilqr_controller/policies/rclcpp_node_policy.hpp
	modified:   nav2_frenet_ilqr_controller/package.xml
	modified:   nav2_frenet_ilqr_controller/src/costs/lateral_distance_cost.cpp
	modified:   nav2_frenet_ilqr_controller/src/costs/longtitutal_velocity_cost.cpp
	modified:   nav2_frenet_ilqr_controller/src/costs/obstacle_cost.cpp
	modified:   nav2_frenet_ilqr_controller/src/parameter_handler.cpp
	modified:   nav2_frenet_ilqr_controller/src/policies/obstacle_policy.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nav2_frenet_ilqr_controller/CMakeLists.txt
	both modified:   nav2_frenet_ilqr_controller/src/frenet_ilqr_controller.cpp
	both modified:   nav2_frenet_ilqr_controller/src/path_handler.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

@CihatAltiparmak
Copy link
Owner

These changes in navigation2 are not backported to humble so closing out

@CihatAltiparmak CihatAltiparmak deleted the mergify/bp/humble/pr-44 branch October 27, 2025 15:37
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