uwcse440 / web-cse440-au15

1 stars 14 forks source link

Poliscope #175

Closed jgao26 closed 8 years ago

jgao26 commented 8 years ago

minor aesthetic changes, updated video on site to final video

jayfo commented 8 years ago

This needs rebased onto master. Look at the network graph and see how you're based on a very old commit:

https://github.com/uwcse440/web-cse440-au15/network

So you need to ensure your master is current (looks like it is):

git checkout master
git pull uwcse440 master
git push

Then you need to rebase onto it:

git checkout poliscope
git rebase -i master
git push -f

That'll update this.

jgao26 commented 8 years ago

okay i ran those commands and am now 3 commits ahead of master and no commits behind i think