Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 10, 2020

This is an automated backport of pull request #10591 done by Mergify

Cherry-pick of ed4897a has failed:

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

You are currently cherry-picking commit ed4897abd6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

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

	both modified:   core/play/src/main/scala/play/api/mvc/Controller.scala

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

(cherry picked from commit ed4897a)
@ignasi35 ignasi35 force-pushed the mergify/bp/master/pr-10591 branch from 40bed91 to 46e82ee Compare December 10, 2020 16:25
@mkurz
Copy link
Member

mkurz commented Jan 11, 2021

@ignasi35 This pull request actually depends on #10582 getting merged first.

@ignasi35
Copy link
Member

@mkurz thanks for the ping!

@ignasi35 ignasi35 closed this Jan 12, 2021
@ignasi35 ignasi35 reopened this Jan 12, 2021
@mergify mergify bot merged commit 31c88df into master Jan 12, 2021
@mergify mergify bot deleted the mergify/bp/master/pr-10591 branch January 12, 2021 11:53
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.

2 participants