Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update past-exec.md and exec.md; Create exec-W16.md; Fixes #166 #204

Merged
merged 1 commit into from
May 20, 2016

Conversation

techiechelle
Copy link
Contributor

No description provided.

@ehashman ehashman temporarily deployed to wics-site-pr-204 May 14, 2016 21:41 Inactive
@evykassirer
Copy link
Member

Looking sweet! Nice work figuring out all the file changes.
You can see what the new website looks like at https://wics-site-pr-204.herokuapp.com/our-volunteers/
The last step is to squish all your commits together so there's only one commit in this pull request.

This is something that was confusing to me for a while, so I'm gonna explain it here just in case (sorry if you already know how to do it)
Docs about the command you use: https://help.github.com/articles/about-git-rebase/

First do git rebase -i HEAD~8 to say you want to squish all the commits since 8 behind your current position
Then you will see a list of all your commits. Keep the first one as pick ___, and then choose fixup (or you can just type f) for the rest of the commits. Save and close, and there should just be one commit there! 🎉 (you can do git log to confirm that)

When you push that change, you'll have to do git push --force because git will be confused and think you're missing all the commits (when really you just turned them all into a new single commit)

@ehashman
Copy link
Contributor

There is a typo: this term should have "Big CSters Director", not plural.

@ehashman ehashman temporarily deployed to wics-site-pr-204 May 18, 2016 01:50 Inactive
@techiechelle
Copy link
Contributor Author

I made a commit to fix the typo

@fboxwala
Copy link
Contributor

You will still need to squash your commits (as evy described above) before we can merge


## Big CSters Directors ##
## Big CSter Directors ##
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be Big CSters Director not Directors.

@ehashman ehashman temporarily deployed to wics-site-pr-204 May 18, 2016 23:26 Inactive
@ehashman ehashman temporarily deployed to wics-site-pr-204 May 18, 2016 23:28 Inactive
@fboxwala
Copy link
Contributor

lgtm!

@fboxwala fboxwala merged commit 4b4c4a8 into wics-uw:master May 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants