Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 23, 2025


This is an automatic backport of pull request #1143 done by [Mergify](https://mergify.com).

(cherry picked from commit 4c7e2b0)

# Conflicts:
#	.github/scala-steward.conf
@mergify
Copy link
Contributor Author

mergify bot commented Oct 23, 2025

Cherry-pick of 4c7e2b0 has failed:

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

You are currently cherry-picking commit 4c7e2b0.
  (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:   .github/scala-steward.conf

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

@mkurz
Copy link
Member

mkurz commented Oct 23, 2025

ah, not pinning on the main branch..

@mkurz mkurz closed this Oct 23, 2025
@mkurz mkurz deleted the mergify/bp/main/pr-1143 branch October 23, 2025 11:19
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