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

Bump Jackson to 2.11.x (bp #10781) #10788

Merged
merged 4 commits into from
Mar 25, 2021
Merged

Bump Jackson to 2.11.x (bp #10781) #10788

merged 4 commits into from
Mar 25, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2021

This is an automatic backport of pull request #10781 done by Mergify.

Cherry-pick of 1a87308 has failed:

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

You are currently cherry-picking commit 1a87308db9.
  (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:   .scala-steward.conf
	both modified:   project/Dependencies.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 1a87308)

# Conflicts:
#	.scala-steward.conf
#	project/Dependencies.scala
@mergify mergify bot added the conflicts label Mar 25, 2021
@mergify mergify bot mentioned this pull request Mar 25, 2021
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ignasi35 Merge conflict not yet fixed completely.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went too fast. 🤦🏼‍♂️

ignasi35
ignasi35 previously approved these changes Mar 25, 2021
.scala-steward.conf Outdated Show resolved Hide resolved
@ignasi35 ignasi35 requested a review from mkurz March 25, 2021 11:50
@ignasi35 ignasi35 dismissed their stale review March 25, 2021 11:51

pressed the wrong buttons.

@mergify mergify bot merged commit 9f743d7 into 2.8.x Mar 25, 2021
@mergify mergify bot deleted the mergify/bp/2.8.x/pr-10781 branch March 25, 2021 13:54
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.

None yet

2 participants