This is an automatic copy of pull request #2572 done by Mergify.
Cherry-pick of 9914030120e3f4bd1631254b020446a076480b24 has failed:
On branch mergify/copy/1.6/pr-2572
Your branch is up to date with 'origin/1.6'.
You are currently cherry-picking commit 991403012.
(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: .ci/setup.sh
modified: .github/workflows/ci.yml
modified: .gitlab-ci.yml
modified: benchmark/profiling/prepare/clash-profiling-prepare.cabal
modified: benchmark/profiling/run/clash-profiling.cabal
modified: clash-cosim/clash-cosim.cabal
modified: clash-ghc/clash-ghc.cabal
modified: clash-prelude/clash-prelude.cabal
modified: clash-term/clash-term.cabal
modified: tests/clash-testsuite.cabal
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: .ci/cabal.project.local
both modified: .ci/gitlab/common.yml
both modified: .ci/gitlab/test.yml
both modified: clash-cores/clash-cores.cabal
deleted by us: clash-ffi/clash-ffi.cabal
both modified: clash-lib/clash-lib.cabal
deleted by us: nix/overlay.nix
both modified: tests/src/Test/Tasty/Clash.hs
Cherry-pick of 9b62e2193b8d3736df2a07d841d8feb663d91944 has failed:
On branch mergify/copy/1.6/pr-2572
Your branch is ahead of 'origin/1.6' by 2 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 9b62e2193.
(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: flake.nix
no changes added to commit (use "git add" and/or "git commit -a")
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
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 ` will backport this PR on `` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
This is an automatic copy of pull request #2572 done by Mergify. Cherry-pick of 9914030120e3f4bd1631254b020446a076480b24 has failed:
Cherry-pick of 9b62e2193b8d3736df2a07d841d8feb663d91944 has failed:
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](https://docs.mergify.com/). 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