Closed g-liu closed 8 years ago
Check out that big tangled history:
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
):
So I merged it and deleted my g-liu-sitless
:
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.
Hopefully this time around, everything should be in the correct state. I checked my
master
branch and it says it's even withuwcse440:master
. All of the development work is now moved to thesitless
branch.