search

wics-uw / website

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

adds volunteer opportunities page, updates about and faq pages #215

Closed arshiamufti closed 8 years ago

arshiamufti commented 8 years ago

addresses #102 and my bad for not making PR from feature branch :(

fboxwala commented 8 years ago

@wics-uw/contributors SO okay, I have said this a few times to people individually but I want everyone to see and understand - do not ever git pull. When you edit the commit history and try to push your branch, git will suggest that you do a git pull and that if you do not git pull you will not be able to push your branch. This is not true. What you need to do usually is this:

git fetch upstream git rebase upstream/master git push -f origin HEAD

If you are not sure how to proceed then ping me or Melted or Evy or e# or post in #wics-sys and we will help you out.

When you git pull you get weird stuff happening like with Arshia's commit history right now. (sorry to call you out like this Arshia but this is a perfect learning opportunity and I didn't want to pass it up.)

Moral of the story: when working on a public shared git repository, never ever ever git pull no matter how badly git wants you to.

arshiamufti commented 8 years ago

Imo it's useful to add this^ to the readme of the website too.

evykassirer commented 8 years ago

other than line length and the extra metadata, it's looking good to me!

evykassirer commented 8 years ago

this is almost done - when can you make the final changes by?

evykassirer commented 8 years ago

last two lines need to be shorter, otherwise all ready! so hyped to merge this!!!

arshiamufti commented 8 years ago

should be fixed now (i think)

evykassirer commented 8 years ago

OKAY looks good!! can you squash the commits now?

arshiamufti commented 8 years ago

will do (clicking on the heroku link prompts me for log in..?)

evykassirer commented 8 years ago

you were probably clicking on the wrong link (don't click deployed, click wics-site-pr-215)

try this one https://wics-site-pr-215.herokuapp.com/

arshiamufti commented 8 years ago

i squashed a thing did it work?

evykassirer commented 8 years ago

screen shot 2016-07-12 at 1 58 59 pm yeah it's all one commit!

but you actually have something else to fix woops so fix it and then squash and hopefully that's it

evykassirer commented 8 years ago

looks 💯 good to me!

🎉 🎆 🎈 ❗ 😃 💯 🚀

thanks for all your work on this @arshiamufti ❤️ twas a big task you took on

I'm so excited to have this information on our website