Rebasing Code