Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version of pre-commit hooks (backport #148) #152

Merged
merged 2 commits into from
Nov 1, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 1, 2024

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 #148 done by Mergify.

Co-authored-by: christophfroehlich <[email protected]>
(cherry picked from commit f1ec9fa)

# Conflicts:
#	.pre-commit-config.yaml
@mergify mergify bot added the conflicts label Nov 1, 2024
Copy link
Author

mergify bot commented Nov 1, 2024

Cherry-pick of f1ec9fa has failed:

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

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

@christophfroehlich christophfroehlich merged commit e35dc75 into humble Nov 1, 2024
4 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-148 branch November 1, 2024 16:32
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.

1 participant