Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 8, 2025


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

@mergify mergify bot added the conflicts label Apr 8, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Apr 8, 2025

Cherry-pick of 559f6a7 has failed:

On branch mergify/bp/2.9.x/pr-183
Your branch is up to date with 'origin/2.9.x'.

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

(cherry picked from commit 559f6a7)

# Conflicts:
#	.github/scala-steward.conf
@mkurz mkurz force-pushed the mergify/bp/2.9.x/pr-183 branch from 53cb5cb to 4d7fe34 Compare April 8, 2025 09:48
@mkurz mkurz merged commit 4a8835d into 2.9.x Apr 8, 2025
1 of 2 checks passed
@mkurz mkurz deleted the mergify/bp/2.9.x/pr-183 branch April 8, 2025 09:48
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