Skip to content

Backport #10664: cabal.release.project: pick newer unix that fixes important bugs on i386 and arm#10673

Merged
mergify[bot] merged 1 commit into3.14.1.1from
mergify/bp/3.14.1.1/pr-10664
Dec 26, 2024
Merged

Backport #10664: cabal.release.project: pick newer unix that fixes important bugs on i386 and arm#10673
mergify[bot] merged 1 commit into3.14.1.1from
mergify/bp/3.14.1.1/pr-10664

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 26, 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.
  • 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 #10664 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Dec 26, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Dec 26, 2024

Cherry-pick of 41ce532 has failed:

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

You are currently cherry-picking commit 41ce532cf.
  (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.release.project

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

@geekosaur geekosaur added the merge me Tell Mergify Bot to merge label Dec 26, 2024
@Mikolaj Mikolaj force-pushed the mergify/bp/3.14.1.1/pr-10664 branch from 3600074 to 9a6ea74 Compare December 26, 2024 03:25
@mergify mergify bot merged commit a273a59 into 3.14.1.1 Dec 26, 2024
52 checks passed
@mergify mergify bot deleted the mergify/bp/3.14.1.1/pr-10664 branch December 26, 2024 05:33
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