Skip to content

Fix ament_cmake dependency (backport #795)#810

Merged
EugenioCollado merged 2 commits into
jazzyfrom
mergify/bp/jazzy/pr-795
May 27, 2026
Merged

Fix ament_cmake dependency (backport #795)#810
EugenioCollado merged 2 commits into
jazzyfrom
mergify/bp/jazzy/pr-795

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 27, 2026

@mergify mergify Bot requested a review from pablogs9 as a code owner May 27, 2026 07:49
@mergify mergify Bot added the conflicts label May 27, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 27, 2026

Cherry-pick of 1662e44 has failed:

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

You are currently cherry-picking commit 1662e44.
  (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:   package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   scripts/create_firmware_ws.sh

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 27, 2026
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/jazzy/pr-795 branch from 4941b7a to a5bb6e3 Compare May 27, 2026 07:54
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/jazzy/pr-795 branch from d2cef7c to 6e9f962 Compare May 27, 2026 10:14
@EugenioCollado EugenioCollado merged commit 0f5651c into jazzy May 27, 2026
18 of 20 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/jazzy/pr-795 branch May 27, 2026 13:16
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