You're the only other person that was working with me in this private branch in my sandbox.  Do you have anything that has yet to be committed?  I'm going to now merge from bigbang then replace the bigbang with this private branch so we can all get going in bigbang together.  If you have a problem just shelf the changes you have by copying your local changes to your own sandbox until you can merge them back.