Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 6, 2025

Follow-up to #5548, see #5548 (comment)


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

Signed-off-by: Christophe Bedard <[email protected]>
(cherry picked from commit f42056c)

# Conflicts:
#	source/Releases/Release-Kilted-Kaiju.rst
#	source/Tutorials/Beginner-CLI-Tools/Recording-And-Playing-Back-Data/Recording-And-Playing-Back-Data.rst
#	source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Actions/Understanding-ROS2-Actions.rst
@mergify
Copy link
Contributor Author

mergify bot commented May 6, 2025

Cherry-pick of f42056c has failed:

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

You are currently cherry-picking commit f42056c.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Releases/Release-Kilted-Kaiju.rst
	both modified:   source/Tutorials/Beginner-CLI-Tools/Recording-And-Playing-Back-Data/Recording-And-Playing-Back-Data.rst
	both modified:   source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Actions/Understanding-ROS2-Actions.rst

no changes added to commit (use "git add" and/or "git commit -a")

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 added the conflicts label May 6, 2025
@christophebedard
Copy link
Member

Just like #5565, we don't want to backport this to Jazzy or Humble

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