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

Add bounds for base in hls-test-utils (backport #1791) #1793

Merged
merged 2 commits into from
May 4, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 4, 2021

This is an automatic backport of pull request #1791 done by Mergify.
Cherry-pick of 98fa0fc has failed:

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

You are currently cherry-picking commit 98fa0fc1.
  (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:   hls-test-utils/hls-test-utils.cabal

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://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 98fa0fc)

# Conflicts:
#	hls-test-utils/hls-test-utils.cabal
@berberman berberman merged commit 7f5c873 into 1.1.0-hackage May 4, 2021
@berberman berberman deleted the mergify/bp/1.1.0-hackage/pr-1791 branch May 4, 2021 16:02
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.

1 participant