Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 3, 2025

Addresses #514


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

Signed-off-by: Yadunund <yadunund@openrobotics.org>
Co-authored-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
(cherry picked from commit 8c49a99)

# Conflicts:
#	composition/README.md
@mergify mergify bot added the conflicts label Oct 3, 2025
Copy link
Contributor Author

mergify bot commented Oct 3, 2025

Cherry-pick of 8c49a99 has failed:

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

You are currently cherry-picking commit 8c49a99.
  (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:   composition/src/linktime_composition.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   composition/README.md

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 <ahcorde@gmail.com>
@ahcorde
Copy link
Contributor

ahcorde commented Oct 3, 2025

Pulls: #743
Gist: https://gist.githubusercontent.com/ahcorde/6c9ccd47adee7eaafe7970155669d91f/raw/f0a437149322d75fef545c754d7461bc5b299f24/ros2.repos
BUILD args: --packages-above-and-dependencies composition
TEST args: --packages-above composition
ROS Distro: jazzy
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/17182

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

@ahcorde ahcorde merged commit 2d16081 into jazzy Oct 6, 2025
3 checks passed
@ahcorde ahcorde deleted the mergify/bp/jazzy/pr-640 branch October 6, 2025 08:58
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