search

google / blockly-android

Blockly for Android
Apache License 2.0
671 stars 209 forks source link

Changes to allow hats per block type #660

Closed jorgebonafe closed 7 years ago

jorgebonafe commented 7 years ago

This change is Reviewable

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.

jorgebonafe commented 7 years ago

I signed it!

2017-09-20 20:30 GMT-03:00 googlebot notifications@github.com:

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).

📝 Please visit https://cla.developers.google.com/ https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.

  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data https://cla.developers.google.com/clas and verify that your email is set on your git commits https://help.github.com/articles/setting-your-email-in-git/.
  • If your company signed a CLA, they designated a Point of Contact who decides which employees are authorized to participate. You may need to contact the Point of Contact for your company and ask to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the project maintainer to go/cla#troubleshoot.
  • In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/google/blockly-android/pull/660#issuecomment-331009043, or mute the thread https://github.com/notifications/unsubscribe-auth/AA-cXKs0mpc4F53aTv3zyclnZQf5Z9Pwks5skZ__gaJpZM4Pem-Y .

googlebot commented 7 years ago

CLAs look good, thanks!

RoboErikG commented 7 years ago

Hi Jorge,

Thanks for the PR. Because of all the unrelated changes we won't be able to merge it, but we'll take a look at the relevant pieces. If you're feeling ambitious about learning git you could try creating a separate branch and cherry-picking just the hat related changes.

jorgebonafe commented 7 years ago

Ok, if I have some time I'll might take a look at that tomorrow.

2017-09-20 20:45 GMT-03:00 RoboErikG notifications@github.com:

Hi Jorge,

Thanks for the PR. Because of all the unrelated changes we won't be able to merge it, but we'll take a look at the relevant pieces. If you're feeling ambitious about learning git you could try creating a separate branch and cherry-picking http://think-like-a-git.net/sections/rebase-from-the-ground-up/cherry-picking-explained.html just the hat related changes.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/google/blockly-android/pull/660#issuecomment-331011355, or mute the thread https://github.com/notifications/unsubscribe-auth/AA-cXAm85IIAJpsH5D8df89PnWCAI2fXks5skaOvgaJpZM4Pem-Y .

jorgebonafe commented 7 years ago

Yeah, I'm afraid to mess too much with this and screw up my Git somehow. But my changes to hats are on these two commits. Everything I changed for the hat features are here, and there are no unrelated changes on them either. They are pretty simple, really.

https://github.com/jorgebonafe/blockly-android/commit/1e618c7bbf61d2bed3284794ec35a701fe6756d4 https://github.com/jorgebonafe/blockly-android/commit/45238e287dccacaba4412767ed8fed684c656c6b

2017-09-20 20:53 GMT-03:00 Jorge Bonafé jorgebonafe@gmail.com:

Ok, if I have some time I'll might take a look at that tomorrow.

2017-09-20 20:45 GMT-03:00 RoboErikG notifications@github.com:

Hi Jorge,

Thanks for the PR. Because of all the unrelated changes we won't be able to merge it, but we'll take a look at the relevant pieces. If you're feeling ambitious about learning git you could try creating a separate branch and cherry-picking http://think-like-a-git.net/sections/rebase-from-the-ground-up/cherry-picking-explained.html just the hat related changes.

AnmAtAnm commented 7 years ago

With respect to preserving your existing work, you just need to make sure you are working in a separate branch (or even safer, a separate repo clone). No worries if you prefer to leave it to us. We can do that, but it will take longer.

Regardless, thanks for the code.