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

[1.6.x] Support >22 args in Scala 3 (backport #747) by @mkurz #748

Merged
merged 6 commits into from
Mar 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 12, 2024

This is an automatic backport of pull request #747 done by Mergify.
Cherry-pick of 1908648 has failed:

On branch mergify/bp/1.6.x/pr-747
Your branch is ahead of 'origin/1.6.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1908648.
  (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:   build.sbt

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e9e3dd4 has failed:

On branch mergify/bp/1.6.x/pr-747
Your branch is ahead of 'origin/1.6.x' by 2 commits.
  (use "git push" to publish your local commits)

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

Changes to be committed:
	new file:   api/shared/src/main/scala/play/twirl/api/Template.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   build.sbt

Cherry-pick of 75eec7c has failed:

On branch mergify/bp/1.6.x/pr-747
Your branch is ahead of 'origin/1.6.x' by 3 commits.
  (use "git push" to publish your local commits)

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

Changes to be committed:
	modified:   compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   build.sbt

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 1908648)

# Conflicts:
#	build.sbt
(cherry picked from commit e9e3dd4)

# Conflicts:
#	build.sbt
(cherry picked from commit 75eec7c)

# Conflicts:
#	build.sbt
@mergify mergify bot added the conflicts label Mar 12, 2024

This comment was marked as resolved.

@mergify mergify bot mentioned this pull request Mar 12, 2024
3 tasks
@mergify mergify bot merged commit 40a2291 into 1.6.x Mar 12, 2024
16 checks passed
@mkurz mkurz deleted the mergify/bp/1.6.x/pr-747 branch March 12, 2024 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant