Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 7, 2025


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

@mergify mergify bot added the conflicts label Jul 7, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jul 7, 2025

Cherry-pick of 1114a2f has failed:

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

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

# Conflicts:
#	.github/scala-steward.conf
@mkurz mkurz force-pushed the mergify/bp/3.0.x/pr-370 branch from 26ff88b to 3807702 Compare July 7, 2025 09:52
@mkurz mkurz merged commit fb51242 into 3.0.x Jul 7, 2025
4 checks passed
@mergify mergify bot deleted the mergify/bp/3.0.x/pr-370 branch July 7, 2025 09:54
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