What if something goes wrong in the middle?

• Two choices:

Fix conflict and continue

        git status
        emacs app/lib/conflicted-file.pm
        git add app/lib/conflicted-file.pm
        git rebase --continue

Give up and try something else

        git rebase --abort

Next