Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 2, 2025

(cherry picked from commit b87334a)

# Conflicts:
#	hardware_interface/include/hardware_interface/handle.hpp
@mergify mergify bot added the conflicts label Jul 2, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jul 2, 2025

Cherry-pick of b87334a has failed:

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

You are currently cherry-picking commit b87334a.
  (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/rolling-semi-binary-build-win.yml
	new file:   ros2_control.windows.rolling.repos

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hardware_interface/include/hardware_interface/handle.hpp

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 merged commit de0de13 into humble Jul 3, 2025
2 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-2338 branch July 3, 2025 08:01
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