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

Auto-update pre-commit hooks (backport #211) #213

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 14, 2024

Automated changes by create-pull-request GitHub action


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

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 45f80cf)

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

mergify bot commented Oct 14, 2024

Cherry-pick of 45f80cf has failed:

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

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

@fmauch fmauch removed the conflicts label Oct 14, 2024
@fmauch fmauch merged commit 6e234bd into iron Oct 14, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/iron/pr-211 branch October 14, 2024 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant