Rebasing from local backup