fix: fix build error for rolling

[wep21]

Signed-off-by: wep21 border_goldenmarket@yahoo.co.jp

Related Issue(required)

Description(required)

Review Procedure(required)

Related PR(optional)

Pre-Review Checklist for the PR Author

PR Author should check the checkboxes below when creating the PR.

• Read commit-guidelines
• Assign PR to reviewer

If you are adding new package following items are required:

• Documentation with description of the package is available
• A sample launch file and parameter file are available if the package contains executable nodes

Checklist for the PR Reviewer

Reviewers should check the checkboxes below before approval.

• Commits are properly organized and messages are according to the guideline
• PR title describes the changes

Post-Review Checklist for the PR Author

PR Author should check the checkboxes below before merging.

• All open points are addressed and tracked via issues or tickets

CI Checks

• Build and test for PR / build-and-test-pr: Required to pass before the merge.
• Build and test for PR / clang-tidy-pr: NOT required to pass before the merge. It is up to the reviewer(s). Found false positives? See the [guidelines][clang-tidy-guidelines].
• Check spelling: NOT required to pass before the merge. It is up to the reviewer(s). See here if you want to add some words to the spell check dictionary.

[kenji-miyake]

https://github.com/autowarefoundation/autoware.universe/runs/4795717536?check_suite_focus=true

ERROR: the following packages/stacks could not have their rosdep keys resolved
to system dependencies:
lanelet2_extension: Cannot locate rosdep definition for [tf2_geoemtry_msgs]
Error: Process completed with exit code 1.

[wep21]

@Mergifyio rebase

[mergify]

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
Auto-merging common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/geometry.hpp
Auto-merging localization/ndt_scan_matcher/include/ndt_scan_matcher/ndt_scan_matcher_core.hpp
Auto-merging localization/ndt_scan_matcher/src/ndt_scan_matcher_core.cpp
Auto-merging localization/pose_initializer/src/pose_initializer_core.cpp
Auto-merging map/lanelet2_extension/package.xml
CONFLICT (content): Merge conflict in map/lanelet2_extension/package.xml
Auto-merging planning/behavior_path_planner/include/behavior_path_planner/utilities.hpp
Auto-merging planning/behavior_velocity_planner/include/scene_module/occlusion_spot/occlusion_spot_utils.hpp
Auto-merging planning/behavior_velocity_planner/src/scene_module/detection_area/debug.cpp
Auto-merging planning/behavior_velocity_planner/src/scene_module/detection_area/scene.cpp
Auto-merging planning/behavior_velocity_planner/src/scene_module/no_stopping_area/scene_no_stopping_area.cpp
Auto-merging sensing/pointcloud_preprocessor/src/concatenate_data/concatenate_data_nodelet.cpp
Auto-merging system/ad_service_state_monitor/src/ad_service_state_monitor_node/ad_service_state_monitor_node.cpp
error: could not apply 44c4a91... fix: fix build error for rolling
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 44c4a91... fix: fix build error for rolling

err-code: 0C32A

[kenji-miyake]

@wep21 You probably need to resolve this. Also, it might be better to use @Mergifyio update in this case to avoid conflicts. (I'm not sure.)

[mergify]

update ` in this case to avoid conflicts. (I'm not sure.)

❌ Base branch update has failed

merge conflict between base and head
err-code: 2220B