Repairing the problems fixed by the git rebase of my branch