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

Limit upper bound vty (copy #2596) #2597

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 2, 2023

This is an automatic copy of pull request #2596 done by Mergify.
Cherry-pick of 6040b05 has failed:

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

You are currently cherry-picking commit 6040b0558.
  (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.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/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 Nov 2, 2023
(cherry picked from commit 6040b05)
@leonschoorl leonschoorl force-pushed the mergify/copy/1.6/pr-2596 branch from 105e814 to 805e669 Compare November 2, 2023 14:48
@leonschoorl leonschoorl enabled auto-merge (squash) November 2, 2023 14:49
@leonschoorl leonschoorl merged commit a805754 into 1.6 Nov 2, 2023
8 checks passed
@leonschoorl leonschoorl deleted the mergify/copy/1.6/pr-2596 branch November 2, 2023 15:55
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.

1 participant