search

wics-uw / website

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

Winter 2016 committee #168

Closed arshiamufti closed 8 years ago

fboxwala commented 8 years ago

One thing, the commit message should be something like what it does, starting with a present tense verb. So for this it should be:

"adds page for fall 2015 committee and updates current committee members"

arshiamufti commented 8 years ago

Yeah, I noticed only after I read the commit structure in the readme :/

fboxwala commented 8 years ago

@annalorimer says "frig I was going to do that with the little ones on saturday" so now she doesnt want me to merge

arshiamufti commented 8 years ago

mm yeah I saw on irc it's fine (y)

fboxwala commented 8 years ago

@arshiamufti we ended up doing a different thing with the frosh so if you fix fixes I'll merge

fboxwala commented 8 years ago

This wont be mergeable right now because of the extraneous commits. Do you want to work through it today sometime?

ehashman commented 8 years ago

Looks like this needs a serious rebase. At this point I'd almost recommend generating a patch and throwing the branch away, going to be hard to salvage commits.

arshiamufti commented 8 years ago

@ehashman So @fboxwala and I are working through this today to fix it. (I tried to squash my commits by doing an interactive rebase and...this happened.)