Sort:  

I got stuck on a fork at the end of the rebuild. This time, I was successful in rolling back my chain and resyncing.