Improve handling of merge conflicts during update

[geofflamrock]

At the moment when there are merge conflicts during stack update the command fails and exits. You then need to fix the conflicts, commit and re-do the overall command, which isn't a great experience. Instead it would be good to detect the merge conflicts, tell the user to go fix them and commit and wait for confirmation before continuing on to the next branch in the stack.