Hit failed on rebase when conflict

[vrom911]

When using hit fresh, if git rebase is not completed because of the conflict files then the command fails

hit: callCommand: git rebase origin/master (exit 128): failed

It should output instructions instead and not show the frightening error.

[chshersh]

@vrom911 This would be really good to do indeed! Probably the easiest solution would be to catch the specific error of git rebase command and output instructions on it.

[mstruebing]

Instructions would be to modify the conflicting files, add them and do git rebase --continue.
Is this possible by Hit? Otherwise you need to switch over to git and reproduce the behavior of hit fresh manually.