Closed boindil closed 3 years ago
Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).
:memo: Please visit https://cla.developers.google.com/ to sign.
Once you've signed (or fixed any issues), please reply here with @googlebot I signed it!
and we'll verify it.
ℹ️ Googlers: Go here for more info.
Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).
:memo: Please visit https://cla.developers.google.com/ to sign.
Once you've signed (or fixed any issues), please reply here with @googlebot I signed it!
and we'll verify it.
ℹ️ Googlers: Go here for more info.
@googlebot I signed it!
CLAs look good, thanks!
ℹ️ Googlers: Go here for more info.
Thanks for the PR @boindil - could you squash the two commits together and change the commit message to something like:
feat(jsdoc): add support for parsing ES2017 syntax
Fixes #312
@petebacondarwin how would I do that? As far as I know you should have the option to squash the commits on acceptance of the PR.
Or would you like me to create a new PR with a single commit message?
@boindil - yes, in this case I think that the "squash and merge" button would suffice since after squashing there would only be a single commit to merge, and I can update the message accordingly at that point. But more generally, we like to keep the commits from the PR as much as possible, and sometimes it is necessary to squash just a few of the commits, which this button does not support. So the normal approach is to rebase your PR branch on the master branch and do the squashing and rewriting of commit messages there before force-pushing back to GitHub. You can do this via the command line:
git checkout patch-1
git rebase -i master
# a text editor should open to allow you to modify the commits
# in this you can also choose to reword commits, which will open a text editor as necessary
git rebase --continue # as necessary
git push --force-with-lease
I suspect from the fact that your branch is called patch-1
that you created this PR via the Github UI, which may be why you are not aware of this command line approach?
@petebacondarwin yup, I did this by using github. However I did never use the rebase command before, so thanks for the clarification :)
This would allow the usage of additional stuff such as the - nowadays widespread - async keyword.
I verified this in a local setup.
312