Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2023

This is an automatic backport of pull request #9071 done by Mergify.
Cherry-pick of ec75950 has failed:

On branch mergify/bp/3.10/pr-9071
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit ec75950b3.
  (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-syntax/src/Distribution/Compat/Prelude.hs

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

Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We forgot to approve...

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jul 11, 2023
@ulysses4ever
Copy link
Collaborator

@mergify refresh

@mergify
Copy link
Contributor Author

mergify bot commented Jul 12, 2023

refresh

✅ Pull request refreshed

@ulysses4ever
Copy link
Collaborator

@mergify squash

Avoid dodgy Rep (..) import in Cabal-syntax

Fixes #9070.

(cherry picked from commit ec75950)

# Conflicts:
#	Cabal-syntax/src/Distribution/Compat/Prelude.hs

* Merge branch '3.10' into mergify/bp/3.10/pr-9071
@mergify
Copy link
Contributor Author

mergify bot commented Jul 12, 2023

squash

✅ Pull request squashed successfully

@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.10/pr-9071 branch from a0975df to 2722e81 Compare July 12, 2023 11:41
@ulysses4ever ulysses4ever added merge me Tell Mergify Bot to merge and removed squash+merge me Tell Mergify Bot to squash-merge labels Jul 12, 2023
@mergify mergify bot merged commit 4bc59df into 3.10 Jul 12, 2023
@mergify mergify bot deleted the mergify/bp/3.10/pr-9071 branch July 12, 2023 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants