Closed shivangipatwardhan2018 closed 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)
Yes will do.
So....this wasn't merged in before the event.
@shivangipatwardhan2018 can you make the changes people asked for so we can merge it?
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 .
@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
okay I was not aware. I will do it after work today
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
You're welcome to try squashing on your own anyways if you want, and I think adding the ndash would be good too.
Evy you were right the push had not gone though fixed the ndash issue also all should be okay now. :)
oh haha so you did it but just didn't push - classic 😄
👌 👌 👌 👌 👌 👌 👌 👌
Please let me know if anything is to be changed.