Closed artemvmin closed 8 years ago
It looks like you got this feature branch successfully based on uwcse440:master. I'm not quite sure how, given that g-liu:master has diverged so much. But I can merge.
uwcse440:master
g-liu:master
When you want to get your master back to the same as our master:
master
git checkout master git reset --hard uwcse440/master git push -f
It looks like you got this feature branch successfully based on
uwcse440:master
. I'm not quite sure how, given thatg-liu:master
has diverged so much. But I can merge.When you want to get your
master
back to the same as ourmaster
: