ReIndex now rebases local pending changes