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 cabal-install-solver synopsis (fix #10183) (backport #10192) #10247

Merged
merged 1 commit into from
Aug 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 3, 2024

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • [NO] Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

This is an automatic backport of pull request #10192 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Aug 3, 2024
Copy link
Contributor Author

mergify bot commented Aug 3, 2024

Cherry-pick of 5f766d2 has failed:

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

You are currently cherry-picking commit 5f766d286.
  (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:   cabal-install-solver/cabal-install-solver.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://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

* Update cabal-install-solver synopsis (fix #10183)

* fixup! remove trailing dot

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 5f766d2)
@geekosaur geekosaur added the merge me Tell Mergify Bot to merge label Aug 3, 2024
@mergify mergify bot merged commit ef670f2 into 3.12 Aug 4, 2024
52 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10192 branch August 4, 2024 01:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants