Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 14, 2025

Automated changes by create-pull-request GitHub action


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

(cherry picked from commit a3390ff)

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

mergify bot commented Oct 14, 2025

Cherry-pick of a3390ff has failed:

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

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

@urfeex urfeex removed the conflicts label Oct 14, 2025
@urfeex urfeex merged commit 5fa0e40 into jazzy Oct 14, 2025
4 of 6 checks passed
@urfeex urfeex deleted the mergify/bp/jazzy/pr-1527 branch October 14, 2025 14:52
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.

2 participants