This is an automatic copy of pull request #2587 done by Mergify.
Cherry-pick of 5b055fb3fcdaf6e2b89cb86486d7280fc781fa84 has failed:
On branch mergify/copy/1.6/pr-2587
Your branch is up to date with 'origin/1.6'.
You are currently cherry-picking commit 5b055fb3f.
(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:
new file: changelog/2023-10-05T16_56_51+02_00_correct_qsys
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: clash-lib/src/Clash/Primitives/Intel/ClockGen.hs
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 #2587 done by Mergify. Cherry-pick of 5b055fb3fcdaf6e2b89cb86486d7280fc781fa84 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