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

Use repeat in QuantumCircuit.power if power is numpy.integer (backport #6910) #6911

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2021

This is an automatic backport of pull request #6910 done by Mergify.
Cherry-pick of 1bdc6f0 has failed:

On branch mergify/bp/stable/0.18/pr-6910
Your branch is up to date with 'origin/stable/0.18'.

You are currently cherry-picking commit 1bdc6f0e6.
  (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:   qiskit/circuit/quantumcircuit.py

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.io/

(cherry picked from commit 1bdc6f0)

# Conflicts:
#	qiskit/circuit/quantumcircuit.py
@mergify mergify bot requested a review from a team as a code owner August 16, 2021 09:23
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Aug 16, 2021
@jakelishman
Copy link
Member

Closing because this change in main shouldn't even have been needed.

@mergify mergify bot deleted the mergify/bp/stable/0.18/pr-6910 branch August 16, 2021 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts used by mergify when there are conflicts in a port
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants