uwcse440 / web-cse440-au15

1 stars 14 forks source link

Update Sitless website - add video, video.js library #157

Closed g-liu closed 8 years ago

g-liu commented 8 years ago

Hopefully this time around, everything should be in the correct state. I checked my master branch and it says it's even with uwcse440:master. All of the development work is now moved to the sitless branch.

jayfo commented 8 years ago

Check out that big tangled history:

download

I cleaned this up like this:

git checkout -b g-liu-sitless master
git pull https://github.com/g-liu/web-cse440-au15.git sitless

git checkout master
git checkout -b squashed
git merge --squash g-liu-sitless

Then I submitted from my squashed branch. See how it's a feature branch now (the blue line), instead of a mess (the red line, on g-liu-sitless):

download 1

So I merged it and deleted my g-liu-sitless:

download 2

Yours is that bump now on the front of master. You should delete your sitless and start a clean feature branch off master for any more work.

Merged in #159.