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

Fix StackOverflow formatting typo in README.md (backport #847) #848

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2024

Summary

Fix StackOverflow formatting typo in README.md.


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

* Fix StackOverflow formatting typo

* Bump numpy version to 2

(cherry picked from commit 6a30bdf)

# Conflicts:
#	README.md
#	constraints.txt
@mergify mergify bot added the conflicts label Nov 12, 2024
@mergify mergify bot requested a review from woodsp-ibm as a code owner November 12, 2024 14:19
Copy link
Contributor Author

mergify bot commented Nov 12, 2024

Cherry-pick of 6a30bdf has failed:

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

You are currently cherry-picking commit 6a30bdf.
  (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:   README.md
	both modified:   constraints.txt

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

edoaltamura
edoaltamura previously approved these changes Nov 12, 2024
@woodsp-ibm woodsp-ibm changed the base branch from stable/0.7 to stable/0.8 November 12, 2024 14:45
@woodsp-ibm woodsp-ibm dismissed edoaltamura’s stale review November 12, 2024 14:45

The base branch was changed.

@woodsp-ibm woodsp-ibm changed the base branch from stable/0.8 to stable/0.7 November 12, 2024 14:45
@woodsp-ibm
Copy link
Member

This was going to the wrong branch (stable/0/7) as the post release PR has not been merged which changes mergify stable target. And it has used the stable 0.7 as the code so while I tried changing the target to stable/0.8 it has far far too many conflicts. I think the easiest is just to close this and do a PR direct to stable/0.8 as its just a small amount of change

@edoaltamura
Copy link
Collaborator

Oh no! I agree, let me open a different PR now. Do I understand correctly that once #844 is in mergify should indeed select the stable0.8 branch?

@woodsp-ibm
Copy link
Member

Do I understand correctly that once....

Yes, the config change in that PR for mergify will have it use the new stable branch once that is merged,

@edoaltamura
Copy link
Collaborator

Great! It should work from now on. I have created a new PR directly to the stable branch for the moment.
Also, mergify created this branch mergify/bp/stable/0.7/pr-847, which I assume can be deleted now?

@edoaltamura edoaltamura deleted the mergify/bp/stable/0.7/pr-847 branch November 12, 2024 16:18
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.

2 participants