Complex rebasing

[Andrew Haley]

My first rebase has run into the weeds.

I've been hit by the reorganization, which causes quite a lot of merge
errors in my imports.  But the biggest problem I've come across is
that my newly-added files seem to disappear when I do a git rebase!
Is this usual, is this something to do with the reorganization, or is
it that I must have made a mistake somewhere?  I've followed the
instructions about rebasing as carefully as I can.

Thanks,

Andrew.