Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jul 3, 2025

ros-controls/control.ros.org#470


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

(cherry picked from commit 8462152)

# Conflicts:
#	doc/migration.rst
#	doc/release_notes.rst
@mergify
Copy link
Author

mergify bot commented Jul 3, 2025

Cherry-pick of 8462152 has failed:

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

You are currently cherry-picking commit 8462152.
  (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:
	new file:   .github/workflows/jazzy-check-docs.yml
	new file:   .github/workflows/rolling-check-docs.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   doc/migration.rst
	deleted by us:   doc/release_notes.rst

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 Jul 3, 2025
@christophfroehlich christophfroehlich merged commit e35300a into humble Jul 3, 2025
8 of 10 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-424 branch July 3, 2025 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants