add-resume-feature-to-update-command

### Changelog
* added merge conflict error to update command
`--resume` is not currently an option on this command.  We can either omit it from the error message since it is unused *or* keep the error message since `git integrate` may error out on the update step and require re-running with `--resume`

what do you think?