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

Add new root keys (backport #9068) #9080

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Add new root keys (backport #9068) #9080

merged 1 commit into from
Jul 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2023

This is an automatic backport of pull request #9068 done by Mergify.
Cherry-pick of 7436f8f has failed:

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

You are currently cherry-picking commit 7436f8f12.
  (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-install/src/Distribution/Client/Config.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

@mergify mergify bot added the conflicts label Jul 1, 2023
@mergify mergify bot mentioned this pull request Jul 1, 2023
4 tasks
@mergify mergify bot added the backport label Jul 1, 2023
@ulysses4ever ulysses4ever added attention: needs-rebase merge me Tell Mergify Bot to merge squash+merge me Tell Mergify Bot to squash-merge and removed attention: needs-rebase merge me Tell Mergify Bot to merge labels Jul 9, 2023
@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 squash

Add new root keys

(cherry picked from commit 7436f8f)

# Conflicts:
#	cabal-install/src/Distribution/Client/Config.hs

* Add CHANGELOG entry for PR #9068

(cherry picked from commit 7006704)

* Fix conflict
@mergify
Copy link
Contributor Author

mergify bot commented Jul 12, 2023

squash

✅ Pull request squashed successfully

@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 9b011a4 into 3.10 Jul 12, 2023
40 checks passed
@mergify mergify bot deleted the mergify/bp/3.10/pr-9068 branch July 12, 2023 23:44
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.

2 participants