continue rebase the files and dirs