wics-uw / website

The code that runs http://wics.uwaterloo.ca/
Other
9 stars 49 forks source link

Event post for Lunch with Microsoft #262

Closed shivangipatwardhan2018 closed 7 years ago

shivangipatwardhan2018 commented 7 years ago

Please let me know if anything is to be changed.

fboxwala commented 7 years ago

Nice work - could you just squash your commits into one commit, and next time make sure you're working off of your own feature branch and not master?

(in case you need it - guide to squash)

shivangipatwardhan2018 commented 7 years ago

Yes will do.

arshiamufti commented 7 years ago

So....this wasn't merged in before the event.

evykassirer commented 7 years ago

@shivangipatwardhan2018 can you make the changes people asked for so we can merge it?

shivangipatwardhan2018 commented 7 years ago

I did a while back I am not aware there was anything else to change.

On Wed, Sep 28, 2016 at 9:43 AM, Evy Kassirer notifications@github.com wrote:

@shivangipatwardhan2018 https://github.com/shivangipatwardhan2018 can you make the changes people asked for so we can merge it?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/wics-uw/website/pull/262#issuecomment-250170185, or mute the thread https://github.com/notifications/unsubscribe-auth/AHM88iGtFgjsW8tdnWnRZ9NIxEuENITlks5qum8AgaJpZM4KFuCk .

fboxwala commented 7 years ago

@shivangipatwardhan2018 Oh sorry, I was waiting for you to squash the commits before I merged, and I guess we didn't touch base fast enough. Sorry about the confusion

shivangipatwardhan2018 commented 7 years ago

okay I was not aware. I will do it after work today

evykassirer commented 7 years ago

one cool thing is that we can do squash and merge now when we merge pull requests

so that means you could actually just not squash them and I can do it for you when I merge

screen shot 2016-09-28 at 10 21 26 am

You're welcome to try squashing on your own anyways if you want, and I think adding the ndash would be good too.

shivangipatwardhan2018 commented 7 years ago

Evy you were right the push had not gone though fixed the ndash issue also all should be okay now. :)

evykassirer commented 7 years ago

oh haha so you did it but just didn't push - classic 😄

evykassirer commented 7 years ago

👌 👌 👌 👌 👌 👌 👌 👌