Do rebase with preserve merges with advanced TODO list