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

Tiny follow up to #12983 (backport #12999) #13005

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 20, 2024

Summary

Tiny follow up on #12983 fixing a typos & updating releasenotes.

Details and comments

Since MUMBAI_CMAP is only internally available, I suggested a change to a full example in the reno 🙂


This is an automatic backport of pull request #12999 done by [Mergify](https://mergify.com).

* tiny follow up

* Update releasenotes/notes/deprecate-StochasticSwap-451f46b273602b7b.yaml

Co-authored-by: Elena Peña Tapia <[email protected]>

---------

Co-authored-by: Elena Peña Tapia <[email protected]>
(cherry picked from commit b90c7a7)

# Conflicts:
#	qiskit/transpiler/passes/routing/stochastic_swap.py
#	releasenotes/notes/deprecate-StochasticSwap-451f46b273602b7b.yaml
@mergify mergify bot requested a review from a team as a code owner August 20, 2024 16:49
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Aug 20, 2024
Copy link
Contributor Author

mergify bot commented Aug 20, 2024

Cherry-pick of b90c7a7 has failed:

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

You are currently cherry-picking commit b90c7a706.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   qiskit/transpiler/passes/routing/stochastic_swap.py
	deleted by us:   releasenotes/notes/deprecate-StochasticSwap-451f46b273602b7b.yaml

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@qiskit-bot
Copy link
Collaborator

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the following people are relevant to this code:

  • @Qiskit/terra-core

@ElePT
Copy link
Contributor

ElePT commented Aug 21, 2024

Accidentally triggered the backport for this PR that didn't need it.

@ElePT ElePT closed this Aug 21, 2024
@mergify mergify bot deleted the mergify/bp/stable/1.2/pr-12999 branch August 21, 2024 06:53
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.

3 participants