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

Update scalacheck-1-14 to 3.1.1.1 (bp #1413) #1438

Merged
merged 3 commits into from
May 13, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2020

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

Cherry-pick of a26bff0 has failed:

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

You are currently cherry-picking commit a26bff06.
  (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:   build.sbt
	both modified:   build.sc

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 simulator.

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

* Update scalacheck-1-14 to 3.1.1.1

* Update scalacheck-1-14 to 3.1.1.1

Co-authored-by: Jim Lawson <ucbjrl@berkeley.edu>
(cherry picked from commit a26bff0)

# Conflicts:
#	build.sbt
#	build.sc
@mergify mergify bot requested a review from a team as a code owner May 13, 2020 17:40
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels May 13, 2020
@ucbjrl ucbjrl added the Please Merge Accepted PRs that are ready to be merged. Useful when waiting on CI. label May 13, 2020
Copy link
Contributor

@ucbjrl ucbjrl left a comment

Choose a reason for hiding this comment

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

lgtm

@mergify mergify bot merged commit 55894ec into 3.3.x May 13, 2020
@mergify mergify bot deleted the mergify/bp/3.3.x/pr-1413 branch May 13, 2020 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release Please Merge Accepted PRs that are ready to be merged. Useful when waiting on CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants