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

Skip to content

[7.x] Ebean 15.0.1 (backport #451) by @mkurz #453

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.

Sign up for GitHub

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

Jump to bottom
Closed
mergify wants to merge 2 commits into from
Closed

[7.x] Ebean 15.0.1 (backport #451) by @mkurz #453

mergify wants to merge 2 commits into from

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 11, 2024

This is an automatic backport of pull request #451 done by Mergify.
Cherry-pick of 5aa0fb6 has failed:

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

You are currently cherry-picking commit 5aa0fb6.
  (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:   project/Dependencies.scala

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

Cherry-pick of 5a7fbec has failed:

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

You are currently cherry-picking commit 5a7fbec.
  (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:   project/Dependencies.scala

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

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

mkurz added 2 commits March 11, 2024 15:52
@mkurz @mergify
Ebean 15.0.1
f7c0124 
(cherry picked from commit 5aa0fb6)

# Conflicts:
#	project/Dependencies.scala
@mkurz @mergify
Exclude jackson core dependencies from ebean and use Play's
d4b278a 
(cherry picked from commit 5a7fbec)

# Conflicts:
#	project/Dependencies.scala
@mergify mergify bot added the conflicts label Mar 11, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Mar 11, 2024

Cherry-pick of 5aa0fb6 has failed:

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

You are currently cherry-picking commit 5aa0fb6.
  (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:   project/Dependencies.scala

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

Cherry-pick of 5a7fbec has failed:

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

You are currently cherry-picking commit 5a7fbec.
  (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:   project/Dependencies.scala

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

@mergify mergify bot mentioned this pull request Mar 11, 2024
Merged
@mkurz
Copy link
Member

mkurz commented Mar 11, 2024

Replaced by

@mkurz mkurz closed this Mar 11, 2024
@mkurz mkurz deleted the mergify/bp/7.x/pr-451 branch March 11, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@mkurz