search

wics-uw / website

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

updated new committee members #326

Closed saadiyadesai closed 7 years ago

saadiyadesai commented 7 years ago

forgot to create a branch ugh why am i like this

fboxwala commented 7 years ago

The commit history makes this unmergeable - you've got commits from 2015 stuffed into your master. Can you save the files you edited outside of your git repo, and reset your master branch: https://github.com/wics-uw/git-workshop-W16/wiki/Resetting-a-Branch please?? And reset back 6 commits. Ie. replace the step:

git reset --hard 63ab2de^ with git reset --hard HEAD~6

The just follow the README, and put up a new one.

saadiyadesai commented 7 years ago

closing this; new changes are in my most recent commit