Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 1, 2025

This pull request contains auto-updated files of the pre-commit config. @ros-controls/ros2-maintainers please run the pre-commit workflow manually on the branch auto-update- before merging.


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

(cherry picked from commit 522c15e)

# Conflicts:
#	.pre-commit-config.yaml
@mergify
Copy link
Author

mergify bot commented Feb 1, 2025

Cherry-pick of 522c15e has failed:

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

You are currently cherry-picking commit 522c15e.
  (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:   .pre-commit-config.yaml

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 Feb 1, 2025
@christophfroehlich christophfroehlich merged commit 6175f53 into humble Feb 1, 2025
5 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-169 branch February 1, 2025 10:40
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