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

Support Aeson 2.2 (copy #2578) #2581

Merged
merged 1 commit into from
Sep 24, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 21, 2023

This is an automatic copy of pull request #2578 done by Mergify.
Cherry-pick of 149885c has failed:

On branch mergify/copy/1.6/pr-2578
Your branch is up to date with 'origin/1.6'.

You are currently cherry-picking commit 149885cef.
  (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:   clash-lib/clash-lib.cabal
	modified:   clash-lib/src/Data/Aeson/Extra.hs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .ci/stack-8.10.yaml
	both modified:   .ci/stack-8.6.5.yaml
	both modified:   .ci/stack-8.8.4.yaml
	deleted by us:   .ci/stack-9.0.yaml
	deleted by us:   .ci/stack-9.2.yaml
	deleted by us:   flake.lock
	deleted by us:   flake.nix
	deleted by us:   nix/overlay-ghc902.nix
	deleted by us:   nix/overlay-ghc962.nix
	both modified:   stack.yaml

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.

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 <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Sep 21, 2023
@christiaanb
Copy link
Member

@mergify rebase

@mergify

This comment was marked as off-topic.

Co-authored-by: Vekhir <134215107+Vekhir@users.noreply.github.com>
Co-authored-by: Peter Lebbing <peter@digitalbrains.com>
@DigitalBrains1 DigitalBrains1 enabled auto-merge (squash) September 24, 2023 10:48
@DigitalBrains1 DigitalBrains1 merged commit 7fb10c6 into 1.6 Sep 24, 2023
9 checks passed
@DigitalBrains1 DigitalBrains1 deleted the mergify/copy/1.6/pr-2578 branch September 24, 2023 11:26
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.

3 participants