Rohit Ashiwal <rohit.ashiwal...@gmail.com> writes: > I've covered the advice message behind `advice_resolve_conflict` variable and > changed the order of error and advice to match that of 1/5.
I think the updated text reads much better, i.e. taking from your range-diff: > + cat >expect <<-EOF && > ++ error: there is nothing to skip > + hint: have you committed already? > + hint: try "git cherry-pick --continue" > -+ error: there is nothing to skip > + fatal: cherry-pick failed > + EOF we say "why we failed" upfront with "error", and then for those who would need more clues, we give "how you might want to proceed" as an additionao "hint". That looks more logical, besides being more consistent with how advice messages are given in other codepaths. > I believe that we > don't have any advice variable appropriate for advice in 1/5. If there is nothing, perhaps you would need to invent one. Perhaps "advice_sequencer_in_use" or something? Other than that, looks quite good. Will (re-)queue.
