Skip to content

Cleanup headers (backport #928)#946

Open
mergify[bot] wants to merge 2 commits into
humblefrom
mergify/bp/humble/pr-928
Open

Cleanup headers (backport #928)#946
mergify[bot] wants to merge 2 commits into
humblefrom
mergify/bp/humble/pr-928

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 22, 2026

Description

Cleanup headers

Did you use Generative AI?

Claude sonnet 4.6


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

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
(cherry picked from commit 5c556d6)

# Conflicts:
#	tf2_ros/src/buffer.cpp
@mergify mergify Bot added the conflicts label May 22, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 22, 2026

Cherry-pick of 5c556d6 has failed:

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

You are currently cherry-picking commit 5c556d6.
  (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:   tf2/src/cache.cpp
	modified:   tf2/src/static_cache.cpp
	modified:   tf2/src/time.cpp
	modified:   tf2_bullet/include/tf2_bullet/tf2_bullet.hpp
	modified:   tf2_ros/src/tf2_echo.cpp
	modified:   tf2_ros/src/transform_listener.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tf2_ros/src/buffer.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 mergify Bot mentioned this pull request May 22, 2026
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
@ahcorde
Copy link
Copy Markdown
Contributor

ahcorde commented May 22, 2026

Pulls: #946
Gist: https://gist.githubusercontent.com/ahcorde/6a7dd35ea3882060d1e84a1aae868a84/raw/3de4bd5396ccf2ca19bbdaea3c05355042e334f1/ros2.repos
BUILD args: --packages-above-and-dependencies tf2 tf2_bullet tf2_ros
TEST args: --packages-above tf2 tf2_bullet tf2_ros
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/19352

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

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