Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 5, 2025

Manual backport of #1733


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

@mergify mergify bot added the conflicts label Jun 5, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 5, 2025

Cherry-pick of ae05ed4 has failed:

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

You are currently cherry-picking commit ae05ed4.
  (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:   steering_controllers_library/doc/userdoc.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

@christophfroehlich christophfroehlich force-pushed the mergify/bp/humble/pr-1734 branch from 03c9917 to f9f9046 Compare June 5, 2025 13:58
@christophfroehlich christophfroehlich merged commit e1da865 into humble Jun 5, 2025
3 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1734 branch June 5, 2025 14:12
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