search

wics-uw / website

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

Policies #122

Closed claricen closed 9 years ago

claricen commented 9 years ago

Adds policies in nav; puts code of conduct under it

fboxwala commented 9 years ago

can you submit a PR without the "update fork" commit? You can revert back to before that commit and update your fork from the command line with git rebase upstream/master, instead of making a PR in your repo for it.

claricen commented 9 years ago

which commit was that, 1d2a0d1?

fboxwala commented 9 years ago

removing that one would also be good, but I was referring to 4db340a

ehashman commented 9 years ago

Yeah this isn't in a mergeable state. Clare, here's what I want you to try:

git checkout master         # Go back to your master 
git reset --hard HEAD^      # Remove the one extraneous commit from your master
git fetch upstream          # Get new commits from current master
git rebase upstream/master  # Rebase your master to match the upstream
git checkout -b policies2   # Make a new branch for your PR
git cherry-pick c5dfa0b     # Grab only the commit you want for it
git push origin HEAD        # Push the new branch to GitHub

And then make a pull request from the policies2 branch, and we'll talk about cleaning up your commit tree once you're successful :) If you get stuck, please hop on #wics-sys.

claricen commented 9 years ago

thanks! Fatema walked me through it.