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

Backport #10895: Preflight checks #10897

Closed
wants to merge 3 commits into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 2, 2025

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.
  • N/A 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 #10895 done by [Mergify](https://mergify.com).

ffaf1 added 3 commits April 2, 2025 13:19
base16-bytestring >= 0.1.1 && < 1.1.0.0
                                    ^-- these

(cherry picked from commit f18cd2e)

# Conflicts:
#	cabal-install/cabal-install.cabal
(cherry picked from commit 4822d73)
README.md and CHANGELOG.md are not _source_ files.

(cherry picked from commit dd78644)

# Conflicts:
#	Cabal-hooks/Cabal-hooks.cabal
Copy link
Contributor Author

mergify bot commented Apr 2, 2025

Cherry-pick of f18cd2e has failed:

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

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of dd78644 has failed:

On branch mergify/bp/3.12/pr-10895
Your branch is ahead of 'origin/3.12' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit dd786441e.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   Cabal-hooks/Cabal-hooks.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

@mergify mergify bot added the conflicts label Apr 2, 2025
@mergify mergify bot mentioned this pull request Apr 2, 2025
2 tasks
@mergify mergify bot added the backport label Apr 2, 2025
@ffaf1 ffaf1 closed this Apr 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant