Hey Kevin, On Wed, Nov 2, 2016 at 8:44 PM, Kevin Layer <layer@xxxxxxxxx> wrote: > If the cherry-pick fails due to a merge conflict, it just returns an > exit status of 0. I have a script that does a series of cherry-picks > and I need to know if they succeed. Well, I haven't checked what it returns in git 2.10, but you can always redirect the stdout and stderr to the output and grep for the text which it shows in the actual output. Here[1] is an example of how to do it. [1]: https://github.com/git/git/blob/master/t/t3507-cherry-pick-conflict.sh#L42-L55 Regards, Pranit Bauva