Skip to content

reduce allow-newer entries for shake-bench (backport #2101) #2112

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

Merged
merged 4 commits into from
Aug 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2021

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

On branch mergify/bp/1.3.0-hackage/pr-2101
Your branch is up to date with 'origin/1.3.0-hackage'.

You are currently cherry-picking commit f3620d1e.
  (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:   shake-bench/shake-bench.cabal

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

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

* reduce allow-newer entries for shake-bench

* fix comma

(cherry picked from commit f3620d1)

# Conflicts:
#	cabal.project
@jneira jneira added merge me Label to trigger pull request merge and removed conflicts labels Aug 18, 2021
@jneira jneira merged commit 16b4030 into 1.3.0-hackage Aug 18, 2021
@mergify mergify bot deleted the mergify/bp/1.3.0-hackage/pr-2101 branch August 18, 2021 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge me Label to trigger pull request merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants