search

wics-uw / website

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

Adds event post for the F15 Dropbox coffee chats; addresses #155 #213

Closed annalorimer closed 8 years ago

ehashman commented 8 years ago

Other than that, LGTM. Thanks for going back and adding this.

annalorimer commented 8 years ago

Just noticed I got the date wrong in the summary of the event. Will fix that as well.

ehashman commented 8 years ago

Hey Anna, not sure what you did on your last commits but you seem to have merged two branches with the same commit together:

screenshot at 2016-06-01 18 32 14

Can you reset this to a single commit?

annalorimer commented 8 years ago

Oh boy. Can you give me some guidance on how to do that? I was trying to squash my commits.

ehashman commented 8 years ago

I have no idea what exactly happened there. This appears to be squashed now.

ehashman commented 8 years ago

Other than that, LGTM.

SrishtiG commented 8 years ago

:) thanks for doing this @annalorimer . ++ from me. Can someone with write access pls merge and close?

ehashman commented 8 years ago

@SrishtiG there is still the stray line from the merge conflict in the diff, can't merge this yet.

annalorimer commented 8 years ago

Will fix tonight.

evykassirer commented 8 years ago

https://wics-site-pr-213.herokuapp.com/2015/09/dropbox-coffee-chats/

evykassirer commented 8 years ago

did you close by accident?

annalorimer commented 8 years ago

Nope.

evykassirer commented 8 years ago

why?

evykassirer commented 8 years ago

all you needed to do before merging was rebase and squash 😕

annalorimer commented 8 years ago

Fatema's suggestion to fix the issues with rebasing commits.

evykassirer commented 8 years ago

ah, okay

I'm pretty sure that if you rebase your master and merge that in, the extra commit isn't part of your PR anymore (which seems the easiest route to me, but there's a bunch of ways to fix it and everyone has preferences)