wics-uw / website

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

Adds big csters event #218

Closed bdamerac closed 8 years ago

bdamerac commented 8 years ago

Updated Big Csters fall 2015 event (balancing life)

evykassirer commented 8 years ago

it's kinda annoying to search through the posts so here is the link

https://wics-site-pr-218.herokuapp.com/2015/10/big-csters-balanced-life-s16/

fboxwala commented 8 years ago

So you've fixed the typo in the name of the PR but not in the actual commit message. You're going to have to do a git rebase -i to fix this, and squash the next commit down into this one. On squashing commits:

https://github.com/wics-uw/git-workshop-W16/wiki/Squashing-Commits Ping me if you need help!

Also, you should really be making pull requests from a featurebranch and not your fork's master branch. That way if something goes wrong your master branch is still okay. (I did the same thing by accident at other day at work) In general make sure you're following the workflow described in the README of our repo/the steps in the wiki:

https://github.com/wics-uw/git-workshop-W16/wiki/Part-3:-Feature-Development

evykassirer commented 8 years ago

@Bhargavi1997 how're the changes going? You still need to fix the link and dash and squash the commits.

bdamerac commented 8 years ago

@evykassirer I did most of the changes and then it struck me that absolute vs relative links is an ongoing issue so I decided to wait until it takes a form.

evykassirer commented 8 years ago

it's no longer an ongoing issue - we need to change them (See Elana's comment in the issue about it)

so you can make it relative here

bdamerac commented 8 years ago

Okay! I'll complete it by 9pm today!

evykassirer commented 8 years ago

sweet! thanks for the quick responses 👍

bdamerac commented 8 years ago

I created a pull request from a different branch and not from master this time.

evykassirer commented 8 years ago

sweet! thanks for doing that