search

fossasia / gci14.fossasia.org

FOSSASIA Google Code-In Website 2014/15 http://gci14.fossasia.org
1.57k stars 109 forks source link

Adding Toshita Barve to students. #234

Closed toshitabarve closed 9 years ago

toshitabarve commented 9 years ago

Added myself to GCI students.

namangoel1 commented 9 years ago

@toshitabarve I've added comments to the file, please see and fix.

namangoel1 commented 9 years ago

@toshitabarve Great, thanks! It would be great if you're able to fix the indentation as well.

To check the site, you can do two things:

  1. Create a branch 'ghpages' and upload it. Then you can see the site at toshitabarve.github.io/fossasia.github.io. Here's a quick guide
  2. Follow this guide to set up a local environment.

The latter is a bit difficult to set up, but definitely more useful for testing.

namangoel1 commented 9 years ago

Great, thanks! This looks perfect, just one last request. It's better to have one commit instead of 3 that work on the same files, so can you squash your last commits? Here's a short guide.

Running these two lines should work:

git reset --soft HEAD~3 &&
git commit

Thank you very much for the great work @toshitabarve ! :smile:

toshitabarve commented 9 years ago

I am using GitHub Windows (https://windows.github.com) and I am not sure where I am supposed to run these commands.

namangoel1 commented 9 years ago

@toshitabarve Understood, don't worry about this then. I'll fix this. Let me know if you have any problems running a demo site. Thanks!

roonyh commented 9 years ago

Please merge if work is ok. Don't worry much about commits. :) and if you try to fix the commits, be aware of the authorship of commit. The student should be credited for their work. On Jan 6, 2015 11:08 PM, "namangoel1" notifications@github.com wrote:

@toshitabarve https://github.com/toshitabarve Understood, don't worry about this then. I'll fix this. Let me know if you have any problems running a demo site. Thanks!

— Reply to this email directly or view it on GitHub https://github.com/fossasia/fossasia.github.io/pull/234#issuecomment-68900733 .

namangoel1 commented 9 years ago

@RoonyH She is :) Can you close this manually? Seems like Git didn't detect due to me rebasing.

roonyh commented 9 years ago

I am sorry, I don't follow. Close this? Can't it be merged? Commits look fine to me. I am all tired sleepy and on phone. Merge if code look fine to you.

namangoel1 commented 9 years ago

@RoonyH I've merged by rebasing, but it seems that Github cannot identify that the pull request has been merged. I'd like you to close it manually, since the pull request has been merged.

roonyh commented 9 years ago

Ah. Got it.