Rebasing and Hoping for the best