search

grpc / grpc-docker-library

Contains dockerfiles for gRPC in different languages
Apache License 2.0
207 stars 83 forks source link

update dependencies #43

Closed codingsince1985 closed 6 years ago

codingsince1985 commented 7 years ago

update

googlebot commented 7 years ago

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. 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, please reply here (e.g. I signed it!) and we'll verify. Thanks.

codingsince1985 commented 7 years ago

I signed it!

googlebot commented 7 years ago

CLAs look good, thanks!

eberkund commented 6 years ago

Can this be merged?

thelinuxfoundation commented 6 years ago

Thank you for your pull request. Before we can look at your contribution, we need to ensure all contributors are covered by a Contributor License Agreement.

After the following items are addressed, please respond with a new comment here, and the automated system will re-verify.

Regards, CLA GitHub bot

codingsince1985 commented 6 years ago

I signed CNCF Individual Contributor License Agreement.

nathanielmanistaatgoogle commented 6 years ago

Please squash commits; there's no need for this to be spread out in two commits.

codingsince1985 commented 6 years ago

@nathanielmanistaatgoogle, something happened between April 2017 and May 2018. If you check the dates of the 2 commits, you'll get the idea why there're 2 commits. I'm happy to close this PR and make a new one.

nathanielmanistaatgoogle commented 6 years ago

Please don't close one pull request and open another to accomplish the same goal; it just makes busywork on our side and throws away conversational history.

But do feel that you can throw away the currently drafted commits and push a single new commit containing the content change that you want to make relative to today's head-of-master-branch?

codingsince1985 commented 6 years ago

@nathanielmanistaatgoogle, that's creative. Now I have a branch with same name (update_dependencies) in my forked repository, however it says "unknown repository" here at top in this PR. The link is lost.

nathanielmanistaatgoogle commented 6 years ago

That's surprising. Did you delete and recreate your fork or something?

codingsince1985 commented 6 years ago

Failed few attempts with no luck and ended re-forking. However it's easy to re-produce what happened to this PR on any repo.

  1. fork a repo
  2. create a feature branch in fork-ed repo, and make some changes (commit 1)
  3. create a pull request (no conflict at this moment)
  4. make some changes in base repo that conflicts with the above PR
  5. solve conflict in PR (commit 2)
  6. time to shine...
nathanielmanistaatgoogle commented 6 years ago

I'm not sure the conflict resolution went appropriately. But since things seem to be well and truly borked... do go ahead and open a new pull request.

codingsince1985 commented 6 years ago

It's not even related to how conflict was resolved. It's how git works.

  1. make a change, commit and push it
  2. make another change, commit and push it
  3. locally drop last 2 commits and make a new one. Now you're 2 commits behind and 1 commit ahead of origin.
  4. move forward, the branch will have 4 commits; drop the branch (both locally and remotely) and create a new branch with same name, you'll get "unknown repository" in PR.

Once a commit is pushed to origin, it's not "drafted" anymore. That's the point.

Anyway, I'll open a new PR.