Skip to content

1.24: Move python change notes into rc/1.24 branch #3321

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

Merged
merged 3 commits into from
Apr 22, 2020

Conversation

felicitymay
Copy link
Contributor

From the point of view of history, #3315 should have been targeted against the rc/1.24 branch. I entirely overlooked this when reviewing it.

I've cherry-picked those commit directly onto a new branch from rc/1.24.

@tausbn - not sure if this is the best way to resolve this, or whether it's not worth worrying about.

tausbn and others added 3 commits April 22, 2020 18:15
Co-Authored-By: Felicity Chapman <felicitymay@github.com>
(cherry picked from commit 44b570f)
We don't hyphenate "QL-library" and there were a few typos. Feel free to further revise this if I've changed the meaning too much.

As discussed separately, I was unable to raise this as a PR in GitHub.com and had to resort to a direct commit.

(cherry picked from commit e294681)
Copy link
Contributor

@tausbn tausbn left a comment

Choose a reason for hiding this comment

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

I think this is fine. If the mergeback ends up conflicting, I’ll take care of it.
(I feel rather silly for not realising I had the wrong branch. 😞)

@tausbn tausbn merged commit cf91147 into github:rc/1.24 Apr 22, 2020
@felicitymay felicitymay deleted the 1.24/move-python-change-notes branch April 28, 2020 18:50
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