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

Use Paths_cabal_install for cabal-install version number (backport #9421) #9433

Merged
merged 2 commits into from
Nov 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 11, 2023

This is an automatic backport of pull request #9421 done by Mergify.
Cherry-pick of 5df009c has failed:

On branch mergify/bp/3.10/pr-9421
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit 5df009cae.
  (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:   cabal-install/cabal-install.cabal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install/src/Distribution/Client/Version.hs

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

* Use PackageInfo for cabal-install version number

* Use Paths_cabal_install instead

* Adjust documentation

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 5df009c)

# Conflicts:
#	cabal-install/src/Distribution/Client/Version.hs
@Kleidukos Kleidukos added squash+merge me Tell Mergify Bot to squash-merge merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days and removed conflicts labels Nov 11, 2023
@Kleidukos Kleidukos merged commit 5d97fcf into 3.10 Nov 22, 2023
40 checks passed
@Kleidukos Kleidukos deleted the mergify/bp/3.10/pr-9421 branch November 22, 2023 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant