Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 14, 2025

This PR addresses #69.

Commit bb3c126 should be backported/cherry-picked for humble and jazzy branches.


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

(cherry picked from commit e33a5e9)

# Conflicts:
#	plugin_template/CMakeLists.txt
#	zlib_point_cloud_transport/CMakeLists.txt
#	zstd_point_cloud_transport/CMakeLists.txt
@mergify mergify bot added the conflicts label Nov 14, 2025
@mergify
Copy link
Author

mergify bot commented Nov 14, 2025

Cherry-pick of e33a5e9 has failed:

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

You are currently cherry-picking commit e33a5e9.
  (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:   draco_point_cloud_transport/CMakeLists.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   plugin_template/CMakeLists.txt
	both modified:   zlib_point_cloud_transport/CMakeLists.txt
	both modified:   zstd_point_cloud_transport/CMakeLists.txt

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

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@ahcorde ahcorde merged commit 66fc57b into jazzy Nov 14, 2025
4 checks passed
@ahcorde ahcorde deleted the mergify/bp/jazzy/pr-70 branch November 14, 2025 16:06
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.

3 participants