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

Doc: remove duplicate word in controlflow tutorial #16163

Merged
merged 5 commits into from
Sep 16, 2019

Conversation

adorilson
Copy link
Contributor

Just remove duplicate word in sentence:

use positional-only to prevent prevent breaking API changes

Copy link
Member

@JulienPalard JulienPalard left a comment

Choose a reason for hiding this comment

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

Hi! Thanks for improving the documentation!

In this commit you rewrapped a lot of paragraphs without changing them, which is bad for the log readability. (It mess with git blame, it's hard to review as it's long to find the actual modification, ...).

Can you please rollback those changes and do a minimal commit with just the removal of the duplicate word? I bet the paragraph containing the removed word don't needs rewrapping neither after the removal.

You can simply add a new commit to your branch and push it, as anyway both commits will be squashed while being merged: you don't have to force push, just add a new commit.

@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@JulienPalard
Copy link
Member

As you did it in two separate commit (good) you can simply run git revert 89dbf912798b8440d67f4ab8184c85bafa29dd2b (and git push).

@adorilson
Copy link
Contributor Author

I have made the requested changes; please review again

But, I made a revert wrong. Then I reverted the revert. :/

If you prefer, I can redo the PR from scratch. My bad.

@bedevere-bot
Copy link

Thanks for making the requested changes!

@JulienPalard: please review the changes made to this pull request.

@miss-islington
Copy link
Contributor

Thanks @adorilson for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

Sorry @adorilson and @JulienPalard, I had trouble checking out the 3.8 backport branch.
Please backport using cherry_picker on command line.
cherry_picker b7af4e75657e6478920d00260c48a1a3020002fc 3.8

@JulienPalard
Copy link
Member

@adorilson thanks! The series of revert if not a problem as we squash before merging, see: b7af4e7 it's clean.

@JulienPalard JulienPalard added needs backport to 3.8 only security fixes and removed needs backport to 3.8 only security fixes labels Sep 16, 2019
@miss-islington
Copy link
Contributor

Thanks @adorilson for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-16177 is a backport of this pull request to the 3.8 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.8 only security fixes label Sep 16, 2019
miss-islington added a commit that referenced this pull request Sep 16, 2019
(cherry picked from commit b7af4e7)

Co-authored-by: Adorilson Bezerra <adorilson@gmail.com>
@adorilson adorilson deleted the patch-3 branch March 25, 2024 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir skip issue skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants