Skip to content

Rewording for gravitational waves caption #245

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 1 commit into from
May 20, 2020

Conversation

bjnath
Copy link
Contributor

@bjnath bjnath commented May 19, 2020

Brief description of what is fixed or changed

Fixes gh-244

@rgommers
Copy link
Member

@bjnath there's 3 commits in this PR, while you intended to submit only the last one. The reason is that you correctly created a new branch for each change, however you based the new branch off of the branch you submitted the previous PR from. What you want to do instead is base the new branch off of master, so your branches and PRs are independent of each other.

Of course if changes depend on earlier commits then that doesn't work, but that's unusual (and not the case here) and you should either keep it in a single PR or comment on the dependency.

Don't worry about it for the PR's you already submitted, I'll fix the history for those. For new ones, please try to start from master.

If this is a bit confusing please let me know!

It's dramatic and I struggled with changing it, but the
original wording makes NumPy rather than gravitational waves
the antecedent of "they".
@rgommers rgommers merged commit 608c6f0 into numpy:master May 20, 2020
@rgommers
Copy link
Member

LGTM, merged. Thanks @bjnath

@bjnath
Copy link
Contributor Author

bjnath commented May 20, 2020

If this is a bit confusing please let me know!

Argh, on the contrary I know only too well what you mean. I realized this morning that all my PRs would have other PRs coming along for the ride. Sorry for that -- thanks for cleaning it up. I'll revert to master for future ones.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rewording of gravitational waves caption
2 participants