mergify[bot]
commented
23 hours ago Cherry-pick of e948c8e03304a899893fffc1238d0d6025ed2564 has failed:
On branch mergify/bp/2.24-maintenance/pr-11915
Your branch is up to date with 'origin/2.24-maintenance'.
You are currently cherry-picking commit e948c8e03.
(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: src/libfetchers/cache.cc
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
We're getting more reports in
It appears that something hasn't gone right process-wise. I find this mistake not to be worth investigating, but rather something to pay attention to going forward.
Let's nip this in the bud.
Closes https://github.com/NixOS/nix/issues/10985
Priorities and Process
Add :+1: to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.
This is an automatic backport of pull request #11915 done by Mergify.