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

Loosen dependency bounds (backport #1787) #1788

Merged
merged 1 commit into from
May 3, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 3, 2021

This is an automatic backport of pull request #1787 done by Mergify.
Cherry-pick of 9308ff4 has failed:

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

You are currently cherry-picking commit 9308ff47.
  (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:   haskell-language-server.cabal
	modified:   hls-test-utils/hls-test-utils.cabal
	modified:   plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
	modified:   plugins/hls-class-plugin/hls-class-plugin.cabal
	modified:   plugins/hls-eval-plugin/hls-eval-plugin.cabal
	modified:   plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal
	modified:   plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
	modified:   plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
	modified:   plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
	modified:   plugins/hls-splice-plugin/hls-splice-plugin.cabal
	modified:   plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal
	modified:   plugins/hls-tactics-plugin/hls-tactics-plugin.cabal

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal

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/

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pepe Iborra <pepeiborra@gmail.com>
(cherry picked from commit 9308ff4)

# Conflicts:
#	plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal
@mergify mergify bot added the conflicts label May 3, 2021
@mergify mergify bot mentioned this pull request May 3, 2021
@Ailrun Ailrun merged commit 90fdc13 into 1.1.0-hackage May 3, 2021
@mergify mergify bot deleted the mergify/bp/1.1.0-hackage/pr-1787 branch May 3, 2021 17:08
@berberman
Copy link
Collaborator

@Ailrun Why did you merge this? The conflict hasn't been resolved.

@Ailrun
Copy link
Member

Ailrun commented May 4, 2021

@berberman Oh, I misthought that was resolved. Sorry.

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.

2 participants