Support conflict resolution when committing

If one of the patches in the series of patches being committed fails to apply (e.g. due to a conflict), the whole command is aborted.

It would be nice to have the chance to start a shell and resolve the conflict manually before proceeding.  In my flows, this usually happens when there is a conflict between -fixes and -next.